diff --git a/contrib/other-builds/moses2/FF/FeatureFunctions.cpp b/contrib/other-builds/moses2/FF/FeatureFunctions.cpp
index e08bc6f9f..eb8d53a4a 100644
--- a/contrib/other-builds/moses2/FF/FeatureFunctions.cpp
+++ b/contrib/other-builds/moses2/FF/FeatureFunctions.cpp
@@ -17,7 +17,7 @@
 #include "WordPenalty.h"
 #include "PhrasePenalty.h"
 #include "Distortion.h"
-#include "LexicalReordering.h"
+#include "LexicalReordering/LexicalReordering.h"
 #include "../TranslationModel/PhraseTableMemory.h"
 #include "../TranslationModel/ProbingPT.h"
 #include "../TranslationModel/UnknownWordPenalty.h"
diff --git a/contrib/other-builds/moses2/FF/FeatureRegistry.cpp b/contrib/other-builds/moses2/FF/FeatureRegistry.cpp
index 7dc316776..6e4be95f1 100644
--- a/contrib/other-builds/moses2/FF/FeatureRegistry.cpp
+++ b/contrib/other-builds/moses2/FF/FeatureRegistry.cpp
@@ -7,13 +7,13 @@
 #include "../LM/KENLM.h"
 #include "../LM/LanguageModel.h"
 
-#include "../FF/Distortion.h"
-#include "../FF/LexicalReordering.h"
-#include "../FF/PhrasePenalty.h"
-#include "../FF/WordPenalty.h"
+#include "Distortion.h"
+#include "LexicalReordering/LexicalReordering.h"
+#include "PhrasePenalty.h"
+#include "WordPenalty.h"
 
-#include "../FF/SkeletonStatefulFF.h"
-#include "../FF/SkeletonStatelessFF.h"
+#include "SkeletonStatefulFF.h"
+#include "SkeletonStatelessFF.h"
 
 using namespace std;
 
diff --git a/contrib/other-builds/moses2/FF/LexicalReordering.cpp b/contrib/other-builds/moses2/FF/LexicalReordering/LexicalReordering.cpp
similarity index 96%
rename from contrib/other-builds/moses2/FF/LexicalReordering.cpp
rename to contrib/other-builds/moses2/FF/LexicalReordering/LexicalReordering.cpp
index 204bd69ce..fbc916f95 100644
--- a/contrib/other-builds/moses2/FF/LexicalReordering.cpp
+++ b/contrib/other-builds/moses2/FF/LexicalReordering/LexicalReordering.cpp
@@ -7,14 +7,14 @@
 
 #include <boost/foreach.hpp>
 #include "LexicalReordering.h"
-#include "../TranslationModel/PhraseTable.h"
-#include "../System.h"
-#include "../PhraseImpl.h"
-#include "../PhraseBased/Manager.h"
-#include "../PhraseBased/Hypothesis.h"
-#include "../legacy/InputFileStream.h"
-#include "../legacy/Util2.h"
-#include "../legacy/CompactPT/LexicalReorderingTableCompact.h"
+#include "../../TranslationModel/PhraseTable.h"
+#include "../../System.h"
+#include "../../PhraseImpl.h"
+#include "../../PhraseBased/Manager.h"
+#include "../../PhraseBased/Hypothesis.h"
+#include "../../legacy/InputFileStream.h"
+#include "../../legacy/Util2.h"
+#include "../../legacy/CompactPT/LexicalReorderingTableCompact.h"
 
 using namespace std;
 
diff --git a/contrib/other-builds/moses2/FF/LexicalReordering.h b/contrib/other-builds/moses2/FF/LexicalReordering/LexicalReordering.h
similarity index 95%
rename from contrib/other-builds/moses2/FF/LexicalReordering.h
rename to contrib/other-builds/moses2/FF/LexicalReordering/LexicalReordering.h
index 7973c11c9..d3a8588bc 100644
--- a/contrib/other-builds/moses2/FF/LexicalReordering.h
+++ b/contrib/other-builds/moses2/FF/LexicalReordering/LexicalReordering.h
@@ -8,10 +8,10 @@
 #pragma once
 #include <vector>
 #include <boost/unordered_map.hpp>
-#include "StatefulFeatureFunction.h"
-#include "../TypeDef.h"
-#include "../Phrase.h"
-#include "../legacy/Range.h"
+#include "../StatefulFeatureFunction.h"
+#include "../../TypeDef.h"
+#include "../../Phrase.h"
+#include "../../legacy/Range.h"
 
 namespace Moses2 {
 
diff --git a/contrib/other-builds/moses2/Jamfile b/contrib/other-builds/moses2/Jamfile
index c41860db6..165414ee7 100644
--- a/contrib/other-builds/moses2/Jamfile
+++ b/contrib/other-builds/moses2/Jamfile
@@ -24,13 +24,15 @@ alias deps :  ../../..//z ../../..//boost_iostreams ../../..//boost_filesystem .
    FF/FeatureFunction.cpp 
    FF/FeatureFunctions.cpp 
    FF/FeatureRegistry.cpp
-    FF/LexicalReordering.cpp
     FF/PhrasePenalty.cpp
     FF/SkeletonStatefulFF.cpp
     FF/SkeletonStatelessFF.cpp
     FF/StatefulFeatureFunction.cpp
     FF/StatelessFeatureFunction.cpp
     FF/WordPenalty.cpp
+    
+    FF/LexicalReordering/LexicalReordering.cpp
+
  #   LM/LanguageModelDALM.cpp
     LM/LanguageModel.cpp
     LM/KENLM.cpp