diff --git a/contrib/other-builds/moses2/Distortion.cpp b/contrib/other-builds/moses2/Distortion.cpp
deleted file mode 100644
index defeba0c4..000000000
--- a/contrib/other-builds/moses2/Distortion.cpp
+++ /dev/null
@@ -1,147 +0,0 @@
-/*
- * Distortion.cpp
- *
- *  Created on: 28 Oct 2015
- *      Author: hieu
- */
-
-#include "Distortion.h"
-#include "Hypothesis.h"
-#include "Manager.h"
-#include "moses/Range.h"
-#include "moses/Bitmap.h"
-
-using namespace std;
-
-struct DistortionState_traditional : public Moses::FFState {
-  Moses::Range range;
-  int first_gap;
-  DistortionState_traditional(const Moses::Range& wr, int fg) : range(wr), first_gap(fg) {}
-
-  size_t hash() const {
-    return range.GetEndPos();
-  }
-  virtual bool operator==(const FFState& other) const {
-    const DistortionState_traditional& o =
-      static_cast<const DistortionState_traditional&>(other);
-    return range.GetEndPos() == o.range.GetEndPos();
-  }
-
-};
-
-
-///////////////////////////////////////////////////////////////////////
-Distortion::Distortion(size_t startInd, const std::string &line)
-:StatefulFeatureFunction(startInd, line)
-{
-	ReadParameters();
-}
-
-Distortion::~Distortion() {
-	// TODO Auto-generated destructor stub
-}
-
-const Moses::FFState* Distortion::EmptyHypothesisState(const Manager &mgr, const Phrase &input) const
-{
-	MemPool &pool = mgr.GetPool();
-
-	  // fake previous translated phrase start and end
-	  size_t start = NOT_FOUND;
-	  size_t end = NOT_FOUND;
-	  /*
-	  if (input.m_frontSpanCoveredLength > 0) {
-	    // can happen with --continue-partial-translation
-	    start = 0;
-	    end = input.m_frontSpanCoveredLength -1;
-	  }
-	  */
-	  return new (pool.Allocate<DistortionState_traditional>()) DistortionState_traditional(
-	           Moses::Range(start, end),
-	           NOT_FOUND);
-
-}
-
-void
-Distortion::EvaluateInIsolation(const System &system,
-		const PhraseBase &source, const TargetPhrase &targetPhrase,
-		Scores &scores,
-		Scores *estimatedScore) const
-{
-}
-
-Moses::FFState* Distortion::EvaluateWhenApplied(const Manager &mgr,
-  const Hypothesis &hypo,
-  const Moses::FFState &prevState,
-  Scores &scores) const
-{
-	MemPool &pool = mgr.GetPool();
-
-    const DistortionState_traditional &prev = static_cast<const DistortionState_traditional&>(prevState);
-	SCORE distortionScore = CalculateDistortionScore(
-            prev.range,
-            hypo.GetRange(),
-            prev.first_gap);
-	//cerr << "distortionScore=" << distortionScore << endl;
-
-	scores.PlusEquals(mgr.GetSystem(), *this, distortionScore);
-
-	DistortionState_traditional* res = new (pool.Allocate<DistortionState_traditional>()) DistortionState_traditional(
-	    hypo.GetRange(),
-	    hypo.GetBitmap().GetFirstGapPos());
-	  return res;
-
-}
-
-SCORE Distortion::CalculateDistortionScore(const Moses::Range &prev, const Moses::Range &curr, const int FirstGap) const
-{
-  bool useEarlyDistortionCost = false;
-  if(!useEarlyDistortionCost) {
-    return - (SCORE) ComputeDistortionDistance(prev, curr);
-  } else {
-    /* Pay distortion score as soon as possible, from Moore and Quirk MT Summit 2007
-       Definitions:
-       S   : current source range
-       S'  : last translated source phrase range
-       S'' : longest fully-translated initial segment
-    */
-
-    int prefixEndPos = (int)FirstGap-1;
-    if((int)FirstGap==-1)
-      prefixEndPos = -1;
-
-    // case1: S is adjacent to S'' => return 0
-    if ((int) curr.GetStartPos() == prefixEndPos+1) {
-      //IFVERBOSE(4) std::cerr<< "MQ07disto:case1" << std::endl;
-      return 0;
-    }
-
-    // case2: S is to the left of S' => return 2(length(S))
-    if ((int) curr.GetEndPos() < (int) prev.GetEndPos()) {
-      //IFVERBOSE(4) std::cerr<< "MQ07disto:case2" << std::endl;
-      return (float) -2*(int)curr.GetNumWordsCovered();
-    }
-
-    // case3: S' is a subsequence of S'' => return 2(nbWordBetween(S,S'')+length(S))
-    if ((int) prev.GetEndPos() <= prefixEndPos) {
-      //IFVERBOSE(4) std::cerr<< "MQ07disto:case3" << std::endl;
-      int z = (int)curr.GetStartPos()-prefixEndPos - 1;
-      return (float) -2*(z + (int)curr.GetNumWordsCovered());
-    }
-
-    // case4: otherwise => return 2(nbWordBetween(S,S')+length(S))
-    //IFVERBOSE(4) std::cerr<< "MQ07disto:case4" << std::endl;
-    return (float) -2*((int)curr.GetNumWordsBetween(prev) + (int)curr.GetNumWordsCovered());
-
-  }
-}
-
-int Distortion::ComputeDistortionDistance(const Moses::Range& prev, const Moses::Range& current) const
-{
-  int dist = 0;
-  if (prev.GetNumWordsCovered() == 0) {
-    dist = current.GetStartPos();
-  } else {
-    dist = (int)prev.GetEndPos() - (int)current.GetStartPos() + 1 ;
-  }
-  return abs(dist);
-}
diff --git a/contrib/other-builds/moses2/Distortion.h b/contrib/other-builds/moses2/Distortion.h
deleted file mode 100644
index 7bfff7b58..000000000
--- a/contrib/other-builds/moses2/Distortion.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/*
- * Distortion.h
- *
- *  Created on: 28 Oct 2015
- *      Author: hieu
- */
-
-#ifndef DISTORTION_H_
-#define DISTORTION_H_
-
-#include "StatefulFeatureFunction.h"
-#include "moses/Range.h"
-#include "TypeDef.h"
-
-class Distortion : public StatefulFeatureFunction
-{
-public:
-	Distortion(size_t startInd, const std::string &line);
-	virtual ~Distortion();
-
-  virtual const Moses::FFState* EmptyHypothesisState(const Manager &mgr, const Phrase &input) const;
-
-  virtual void
-  EvaluateInIsolation(const System &system,
-		  const PhraseBase &source,
-		  const TargetPhrase &targetPhrase,
-		  Scores &scores,
-		  Scores *estimatedScore) const;
-
-  virtual Moses::FFState* EvaluateWhenApplied(const Manager &mgr,
-    const Hypothesis &hypo,
-    const Moses::FFState &prevState,
-    Scores &scores) const;
-
-protected:
-  SCORE CalculateDistortionScore(const Moses::Range &prev, const Moses::Range &curr, const int FirstGap) const;
-
-  int ComputeDistortionDistance(const Moses::Range& prev, const Moses::Range& current) const;
-
-};
-
-#endif /* DISTORTION_H_ */
diff --git a/contrib/other-builds/moses2/FeatureFunction.cpp b/contrib/other-builds/moses2/FF/FeatureFunction.cpp
similarity index 98%
rename from contrib/other-builds/moses2/FeatureFunction.cpp
rename to contrib/other-builds/moses2/FF/FeatureFunction.cpp
index 636e9fd9f..3cfd12094 100644
--- a/contrib/other-builds/moses2/FeatureFunction.cpp
+++ b/contrib/other-builds/moses2/FF/FeatureFunction.cpp
@@ -7,7 +7,7 @@
 #include <string>
 #include <vector>
 #include "FeatureFunction.h"
-#include "System.h"
+#include "../System.h"
 #include "moses/Util.h"
 
 using namespace std;
diff --git a/contrib/other-builds/moses2/FeatureFunction.h b/contrib/other-builds/moses2/FF/FeatureFunction.h
similarity index 100%
rename from contrib/other-builds/moses2/FeatureFunction.h
rename to contrib/other-builds/moses2/FF/FeatureFunction.h
diff --git a/contrib/other-builds/moses2/FeatureFunctions.cpp b/contrib/other-builds/moses2/FF/FeatureFunctions.cpp
similarity index 95%
rename from contrib/other-builds/moses2/FeatureFunctions.cpp
rename to contrib/other-builds/moses2/FF/FeatureFunctions.cpp
index c9c051814..808190dfb 100644
--- a/contrib/other-builds/moses2/FeatureFunctions.cpp
+++ b/contrib/other-builds/moses2/FF/FeatureFunctions.cpp
@@ -8,17 +8,17 @@
 #include <boost/foreach.hpp>
 #include "FeatureFunctions.h"
 #include "StatefulFeatureFunction.h"
-#include "System.h"
+#include "../System.h"
+#include "../Scores.h"
+#include "../MemPool.h"
 
 #include "SkeletonStatelessFF.h"
 #include "SkeletonStatefulFF.h"
-#include "PhraseTableMemory.h"
-#include "UnknownWordPenalty.h"
 #include "WordPenalty.h"
 #include "Distortion.h"
-#include "LanguageModel.h"
-#include "Scores.h"
-#include "MemPool.h"
+#include "TranslationModel/PhraseTableMemory.h"
+#include "TranslationModel/UnknownWordPenalty.h"
+#include "LM/LanguageModel.h"
 
 using namespace std;
 
diff --git a/contrib/other-builds/moses2/FeatureFunctions.h b/contrib/other-builds/moses2/FF/FeatureFunctions.h
similarity index 100%
rename from contrib/other-builds/moses2/FeatureFunctions.h
rename to contrib/other-builds/moses2/FF/FeatureFunctions.h
diff --git a/contrib/other-builds/moses2/LanguageModel.cpp b/contrib/other-builds/moses2/FF/LM/LanguageModel.cpp
similarity index 98%
rename from contrib/other-builds/moses2/LanguageModel.cpp
rename to contrib/other-builds/moses2/FF/LM/LanguageModel.cpp
index 5b07e3514..a9025fe9f 100644
--- a/contrib/other-builds/moses2/LanguageModel.cpp
+++ b/contrib/other-builds/moses2/FF/LM/LanguageModel.cpp
@@ -6,9 +6,9 @@
  */
 #include <vector>
 #include "LanguageModel.h"
-#include "System.h"
-#include "Manager.h"
-#include "Hypothesis.h"
+#include "../../System.h"
+#include "../../Search/Manager.h"
+#include "../../Search/Hypothesis.h"
 #include "moses/Util.h"
 #include "moses/InputFileStream.h"
 #include "moses/LM/PointerState.h"
diff --git a/contrib/other-builds/moses2/LanguageModel.h b/contrib/other-builds/moses2/FF/LM/LanguageModel.h
similarity index 95%
rename from contrib/other-builds/moses2/LanguageModel.h
rename to contrib/other-builds/moses2/FF/LM/LanguageModel.h
index 2d51d0510..fdf586ee4 100644
--- a/contrib/other-builds/moses2/LanguageModel.h
+++ b/contrib/other-builds/moses2/FF/LM/LanguageModel.h
@@ -8,11 +8,11 @@
 #ifndef LANGUAGEMODEL_H_
 #define LANGUAGEMODEL_H_
 
-#include "StatefulFeatureFunction.h"
-#include "TypeDef.h"
+#include "../StatefulFeatureFunction.h"
+#include "../../TypeDef.h"
 #include "moses/Factor.h"
 #include "moses/TypeDef.h"
-#include "MorphoTrie/MorphTrie.h"
+#include "../../MorphoTrie/MorphTrie.h"
 
 ////////////////////////////////////////////////////////////////////////////////////////
 struct LMScores
diff --git a/contrib/other-builds/moses2/SkeletonStatefulFF.cpp b/contrib/other-builds/moses2/FF/SkeletonStatefulFF.cpp
similarity index 100%
rename from contrib/other-builds/moses2/SkeletonStatefulFF.cpp
rename to contrib/other-builds/moses2/FF/SkeletonStatefulFF.cpp
diff --git a/contrib/other-builds/moses2/SkeletonStatefulFF.h b/contrib/other-builds/moses2/FF/SkeletonStatefulFF.h
similarity index 100%
rename from contrib/other-builds/moses2/SkeletonStatefulFF.h
rename to contrib/other-builds/moses2/FF/SkeletonStatefulFF.h
diff --git a/contrib/other-builds/moses2/SkeletonStatelessFF.cpp b/contrib/other-builds/moses2/FF/SkeletonStatelessFF.cpp
similarity index 100%
rename from contrib/other-builds/moses2/SkeletonStatelessFF.cpp
rename to contrib/other-builds/moses2/FF/SkeletonStatelessFF.cpp
diff --git a/contrib/other-builds/moses2/SkeletonStatelessFF.h b/contrib/other-builds/moses2/FF/SkeletonStatelessFF.h
similarity index 100%
rename from contrib/other-builds/moses2/SkeletonStatelessFF.h
rename to contrib/other-builds/moses2/FF/SkeletonStatelessFF.h
diff --git a/contrib/other-builds/moses2/StatefulFeatureFunction.cpp b/contrib/other-builds/moses2/FF/StatefulFeatureFunction.cpp
similarity index 100%
rename from contrib/other-builds/moses2/StatefulFeatureFunction.cpp
rename to contrib/other-builds/moses2/FF/StatefulFeatureFunction.cpp
diff --git a/contrib/other-builds/moses2/StatefulFeatureFunction.h b/contrib/other-builds/moses2/FF/StatefulFeatureFunction.h
similarity index 100%
rename from contrib/other-builds/moses2/StatefulFeatureFunction.h
rename to contrib/other-builds/moses2/FF/StatefulFeatureFunction.h
diff --git a/contrib/other-builds/moses2/StatelessFeatureFunction.cpp b/contrib/other-builds/moses2/FF/StatelessFeatureFunction.cpp
similarity index 100%
rename from contrib/other-builds/moses2/StatelessFeatureFunction.cpp
rename to contrib/other-builds/moses2/FF/StatelessFeatureFunction.cpp
diff --git a/contrib/other-builds/moses2/StatelessFeatureFunction.h b/contrib/other-builds/moses2/FF/StatelessFeatureFunction.h
similarity index 100%
rename from contrib/other-builds/moses2/StatelessFeatureFunction.h
rename to contrib/other-builds/moses2/FF/StatelessFeatureFunction.h
diff --git a/contrib/other-builds/moses2/PhraseTable.cpp b/contrib/other-builds/moses2/FF/TranslationModel/PhraseTable.cpp
similarity index 97%
rename from contrib/other-builds/moses2/PhraseTable.cpp
rename to contrib/other-builds/moses2/FF/TranslationModel/PhraseTable.cpp
index 115190948..7436f89a6 100644
--- a/contrib/other-builds/moses2/PhraseTable.cpp
+++ b/contrib/other-builds/moses2/FF/TranslationModel/PhraseTable.cpp
@@ -6,7 +6,7 @@
  */
 #include <boost/foreach.hpp>
 #include "PhraseTable.h"
-#include "InputPaths.h"
+#include "../../InputPaths.h"
 
 using namespace std;
 
diff --git a/contrib/other-builds/moses2/PhraseTable.h b/contrib/other-builds/moses2/FF/TranslationModel/PhraseTable.h
similarity index 91%
rename from contrib/other-builds/moses2/PhraseTable.h
rename to contrib/other-builds/moses2/FF/TranslationModel/PhraseTable.h
index 278c4a22d..4e92425bc 100644
--- a/contrib/other-builds/moses2/PhraseTable.h
+++ b/contrib/other-builds/moses2/FF/TranslationModel/PhraseTable.h
@@ -7,9 +7,9 @@
 #pragma once
 #include <string>
 #include <boost/unordered_map.hpp>
-#include "TargetPhrases.h"
-#include "Word.h"
-#include "StatelessFeatureFunction.h"
+#include "../../TargetPhrases.h"
+#include "../../Word.h"
+#include "../StatelessFeatureFunction.h"
 #include "moses/Util.h"
 
 class System;
diff --git a/contrib/other-builds/moses2/PhraseTableMemory.cpp b/contrib/other-builds/moses2/FF/TranslationModel/PhraseTableMemory.cpp
similarity index 95%
rename from contrib/other-builds/moses2/PhraseTableMemory.cpp
rename to contrib/other-builds/moses2/FF/TranslationModel/PhraseTableMemory.cpp
index ea1522507..c9d79c9c6 100644
--- a/contrib/other-builds/moses2/PhraseTableMemory.cpp
+++ b/contrib/other-builds/moses2/FF/TranslationModel/PhraseTableMemory.cpp
@@ -8,11 +8,11 @@
 #include <cassert>
 #include <boost/foreach.hpp>
 #include "PhraseTableMemory.h"
-#include "Phrase.h"
-#include "TargetPhrase.h"
-#include "System.h"
-#include "Scores.h"
-#include "InputPaths.h"
+#include "../../Phrase.h"
+#include "../../TargetPhrase.h"
+#include "../../System.h"
+#include "../../Scores.h"
+#include "../../InputPaths.h"
 #include "moses/InputFileStream.h"
 
 using namespace std;
diff --git a/contrib/other-builds/moses2/PhraseTableMemory.h b/contrib/other-builds/moses2/FF/TranslationModel/PhraseTableMemory.h
similarity index 100%
rename from contrib/other-builds/moses2/PhraseTableMemory.h
rename to contrib/other-builds/moses2/FF/TranslationModel/PhraseTableMemory.h
diff --git a/contrib/other-builds/moses2/UnknownWordPenalty.cpp b/contrib/other-builds/moses2/FF/TranslationModel/UnknownWordPenalty.cpp
similarity index 95%
rename from contrib/other-builds/moses2/UnknownWordPenalty.cpp
rename to contrib/other-builds/moses2/FF/TranslationModel/UnknownWordPenalty.cpp
index 7774b1d74..edf6f71b4 100644
--- a/contrib/other-builds/moses2/UnknownWordPenalty.cpp
+++ b/contrib/other-builds/moses2/FF/TranslationModel/UnknownWordPenalty.cpp
@@ -6,8 +6,9 @@
  */
 
 #include "UnknownWordPenalty.h"
-#include "System.h"
-#include "Manager.h"
+#include "../../System.h"
+#include "../../InputPath.h"
+#include "../../Search/Manager.h"
 
 UnknownWordPenalty::UnknownWordPenalty(size_t startInd, const std::string &line)
 :PhraseTable(startInd, line)
diff --git a/contrib/other-builds/moses2/UnknownWordPenalty.h b/contrib/other-builds/moses2/FF/TranslationModel/UnknownWordPenalty.h
similarity index 100%
rename from contrib/other-builds/moses2/UnknownWordPenalty.h
rename to contrib/other-builds/moses2/FF/TranslationModel/UnknownWordPenalty.h
diff --git a/contrib/other-builds/moses2/WordPenalty.cpp b/contrib/other-builds/moses2/FF/WordPenalty.cpp
similarity index 86%
rename from contrib/other-builds/moses2/WordPenalty.cpp
rename to contrib/other-builds/moses2/FF/WordPenalty.cpp
index 2dedaa17c..c357d4ab4 100644
--- a/contrib/other-builds/moses2/WordPenalty.cpp
+++ b/contrib/other-builds/moses2/FF/WordPenalty.cpp
@@ -6,10 +6,9 @@
  */
 
 #include "WordPenalty.h"
-#include "TypeDef.h"
-#include "Scores.h"
-#include "TargetPhrase.h"
-#include "Manager.h"
+#include "../TypeDef.h"
+#include "../Scores.h"
+#include "../TargetPhrase.h"
 
 WordPenalty::WordPenalty(size_t startInd, const std::string &line)
 :StatelessFeatureFunction(startInd, line)
diff --git a/contrib/other-builds/moses2/WordPenalty.h b/contrib/other-builds/moses2/FF/WordPenalty.h
similarity index 100%
rename from contrib/other-builds/moses2/WordPenalty.h
rename to contrib/other-builds/moses2/FF/WordPenalty.h
diff --git a/contrib/other-builds/moses2/InputPath.cpp b/contrib/other-builds/moses2/InputPath.cpp
index 07997fb63..875ca0cc7 100644
--- a/contrib/other-builds/moses2/InputPath.cpp
+++ b/contrib/other-builds/moses2/InputPath.cpp
@@ -6,7 +6,7 @@
  */
 
 #include "InputPath.h"
-#include "PhraseTable.h"
+#include "FF/TranslationModel/PhraseTable.h"
 
 InputPath::InputPath(const SubPhrase &subPhrase, const Moses::Range &range, size_t numPt)
 :m_subPhrase(subPhrase)
diff --git a/contrib/other-builds/moses2/Jamfile b/contrib/other-builds/moses2/Jamfile
index 301af0816..4d5f097d7 100644
--- a/contrib/other-builds/moses2/Jamfile
+++ b/contrib/other-builds/moses2/Jamfile
@@ -5,35 +5,36 @@ import option ;
 import path ;
 
  exe moses2 :
-   ArcLists.cpp
-   Distortion.cpp
-   FeatureFunction.cpp 
-   FeatureFunctions.cpp 
-   Hypothesis.cpp 
  	 InputPath.cpp 
  	 InputPaths.cpp
- 	 LanguageModel.cpp
  	 Main.cpp 
- 	 Manager.cpp 
  	 MemPool.cpp
    Phrase.cpp 
-   PhraseTable.cpp 
- 	 PhraseTableMemory.cpp 
- 	 Scores.cpp 
- 	 SearchNormal.cpp
- 	 SkeletonStatefulFF.cpp 
- 	 SkeletonStatelessFF.cpp 
- 	 Stack.cpp 
- 	 StatefulFeatureFunction.cpp 
- 	 StatelessFeatureFunction.cpp 
+   Scores.cpp 
  	 System.cpp 
    TargetPhrase.cpp 
    TargetPhrases.cpp
-   UnknownWordPenalty.cpp 
-		Weights.cpp 
+   Weights.cpp 
 		Word.cpp 
-    WordPenalty.cpp
-    	 
+		FF/Distortion.cpp
+   	FF/FeatureFunction.cpp 
+   	FF/FeatureFunctions.cpp 
+    FF/SkeletonStatefulFF.cpp
+    FF/SkeletonStatelessFF.cpp
+    FF/StatefulFeatureFunction.cpp
+    FF/StatelessFeatureFunction.cpp
+    FF/WordPenalty.cpp
+    FF/LM/LanguageModel.cpp
+ 	 	FF/TranslationModel/PhraseTable.cpp 
+ 	 	FF/TranslationModel/PhraseTableMemory.cpp 
+ 	 	FF/TranslationModel/UnknownWordPenalty.cpp 
+   	Search/ArcLists.cpp
+		Search/Hypothesis.cpp 
+ 	 	Search/Manager.cpp 
+ 	 	Search/SearchNormal.cpp
+ 	 	Search/Stack.cpp 
+
+    
  ../../../moses//moses 
  ../../../OnDiskPt//OnDiskPt 
  ../../..//boost_filesystem  
diff --git a/contrib/other-builds/moses2/Main.cpp b/contrib/other-builds/moses2/Main.cpp
index b7e158c08..bca3eb6c8 100644
--- a/contrib/other-builds/moses2/Main.cpp
+++ b/contrib/other-builds/moses2/Main.cpp
@@ -1,7 +1,7 @@
 #include <iostream>
 #include "System.h"
-#include "Manager.h"
 #include "Phrase.h"
+#include "Search/Manager.h"
 #include "moses/InputFileStream.h"
 #include "moses/Parameter.h"
 
diff --git a/contrib/other-builds/moses2/Scores.cpp b/contrib/other-builds/moses2/Scores.cpp
index 44e68461f..826d71b07 100644
--- a/contrib/other-builds/moses2/Scores.cpp
+++ b/contrib/other-builds/moses2/Scores.cpp
@@ -9,11 +9,11 @@
 #include <cstddef>
 #include <stdio.h>
 #include "Scores.h"
-#include "FeatureFunction.h"
-#include "FeatureFunctions.h"
 #include "Util.h"
 #include "Weights.h"
 #include "System.h"
+#include "FF/FeatureFunction.h"
+#include "FF/FeatureFunctions.h"
 #include "moses/Util.h"
 
 using namespace std;
diff --git a/contrib/other-builds/moses2/ArcLists.cpp b/contrib/other-builds/moses2/Search/ArcLists.cpp
similarity index 100%
rename from contrib/other-builds/moses2/ArcLists.cpp
rename to contrib/other-builds/moses2/Search/ArcLists.cpp
diff --git a/contrib/other-builds/moses2/ArcLists.h b/contrib/other-builds/moses2/Search/ArcLists.h
similarity index 100%
rename from contrib/other-builds/moses2/ArcLists.h
rename to contrib/other-builds/moses2/Search/ArcLists.h
diff --git a/contrib/other-builds/moses2/Hypothesis.cpp b/contrib/other-builds/moses2/Search/Hypothesis.cpp
similarity index 97%
rename from contrib/other-builds/moses2/Hypothesis.cpp
rename to contrib/other-builds/moses2/Search/Hypothesis.cpp
index 317ad7045..9cfbe29e4 100644
--- a/contrib/other-builds/moses2/Hypothesis.cpp
+++ b/contrib/other-builds/moses2/Search/Hypothesis.cpp
@@ -9,9 +9,9 @@
 #include <stdlib.h>
 #include "Hypothesis.h"
 #include "Manager.h"
-#include "System.h"
-#include "Scores.h"
-#include "StatefulFeatureFunction.h"
+#include "../System.h"
+#include "../Scores.h"
+#include "../FF/StatefulFeatureFunction.h"
 
 using namespace std;
 
diff --git a/contrib/other-builds/moses2/Hypothesis.h b/contrib/other-builds/moses2/Search/Hypothesis.h
similarity index 98%
rename from contrib/other-builds/moses2/Hypothesis.h
rename to contrib/other-builds/moses2/Search/Hypothesis.h
index a49d86467..e919b498e 100644
--- a/contrib/other-builds/moses2/Hypothesis.h
+++ b/contrib/other-builds/moses2/Search/Hypothesis.h
@@ -12,7 +12,7 @@
 #include <cstddef>
 #include "moses/FF/FFState.h"
 #include "moses/Bitmap.h"
-#include "Scores.h"
+#include "../Scores.h"
 
 class Manager;
 class Phrase;
diff --git a/contrib/other-builds/moses2/Manager.cpp b/contrib/other-builds/moses2/Search/Manager.cpp
similarity index 95%
rename from contrib/other-builds/moses2/Manager.cpp
rename to contrib/other-builds/moses2/Search/Manager.cpp
index 6f18a7e69..c759986bd 100644
--- a/contrib/other-builds/moses2/Manager.cpp
+++ b/contrib/other-builds/moses2/Search/Manager.cpp
@@ -6,13 +6,13 @@
  */
 #include <boost/foreach.hpp>
 #include "Manager.h"
-#include "PhraseTable.h"
-#include "System.h"
 #include "SearchNormal.h"
-#include "TargetPhrases.h"
-#include "TargetPhrase.h"
-#include "InputPaths.h"
-#include "InputPath.h"
+#include "../System.h"
+#include "../TargetPhrases.h"
+#include "../TargetPhrase.h"
+#include "../InputPaths.h"
+#include "../InputPath.h"
+#include "../FF/TranslationModel/PhraseTable.h"
 #include "moses/Range.h"
 
 using namespace std;
diff --git a/contrib/other-builds/moses2/Manager.h b/contrib/other-builds/moses2/Search/Manager.h
similarity index 92%
rename from contrib/other-builds/moses2/Manager.h
rename to contrib/other-builds/moses2/Search/Manager.h
index 73d9de284..7e11f0bc5 100644
--- a/contrib/other-builds/moses2/Manager.h
+++ b/contrib/other-builds/moses2/Search/Manager.h
@@ -10,10 +10,10 @@
 #include <cstddef>
 #include <string>
 #include <vector>
-#include "InputPaths.h"
+#include "../InputPaths.h"
+#include "../TargetPhrase.h"
+#include "../MemPool.h"
 #include "Stack.h"
-#include "TargetPhrase.h"
-#include "MemPool.h"
 #include "moses/Bitmaps.h"
 #include "moses/SquareMatrix.h"
 
diff --git a/contrib/other-builds/moses2/SearchNormal.cpp b/contrib/other-builds/moses2/Search/SearchNormal.cpp
similarity index 96%
rename from contrib/other-builds/moses2/SearchNormal.cpp
rename to contrib/other-builds/moses2/Search/SearchNormal.cpp
index 6a539c7b0..c14565df3 100644
--- a/contrib/other-builds/moses2/SearchNormal.cpp
+++ b/contrib/other-builds/moses2/Search/SearchNormal.cpp
@@ -10,9 +10,9 @@
 #include "SearchNormal.h"
 #include "Stack.h"
 #include "Manager.h"
-#include "InputPaths.h"
-#include "TargetPhrases.h"
-#include "TargetPhrase.h"
+#include "../InputPaths.h"
+#include "../TargetPhrases.h"
+#include "../TargetPhrase.h"
 
 using namespace std;
 
diff --git a/contrib/other-builds/moses2/SearchNormal.h b/contrib/other-builds/moses2/Search/SearchNormal.h
similarity index 100%
rename from contrib/other-builds/moses2/SearchNormal.h
rename to contrib/other-builds/moses2/Search/SearchNormal.h
diff --git a/contrib/other-builds/moses2/Stack.cpp b/contrib/other-builds/moses2/Search/Stack.cpp
similarity index 98%
rename from contrib/other-builds/moses2/Stack.cpp
rename to contrib/other-builds/moses2/Search/Stack.cpp
index c2b9ddcc1..bc82322c8 100644
--- a/contrib/other-builds/moses2/Stack.cpp
+++ b/contrib/other-builds/moses2/Search/Stack.cpp
@@ -7,7 +7,7 @@
 
 #include "Stack.h"
 #include "Hypothesis.h"
-#include "Scores.h"
+#include "../Scores.h"
 
 Stack::Stack() {
 	// TODO Auto-generated constructor stub
diff --git a/contrib/other-builds/moses2/Stack.h b/contrib/other-builds/moses2/Search/Stack.h
similarity index 100%
rename from contrib/other-builds/moses2/Stack.h
rename to contrib/other-builds/moses2/Search/Stack.h
diff --git a/contrib/other-builds/moses2/System.cpp b/contrib/other-builds/moses2/System.cpp
index 65cc5b329..39fe0f5a2 100644
--- a/contrib/other-builds/moses2/System.cpp
+++ b/contrib/other-builds/moses2/System.cpp
@@ -8,8 +8,8 @@
 #include <iostream>
 #include <boost/foreach.hpp>
 #include "System.h"
-#include "FeatureFunction.h"
-#include "UnknownWordPenalty.h"
+#include "FF/FeatureFunction.h"
+#include "FF/TranslationModel/UnknownWordPenalty.h"
 #include "moses/Util.h"
 #include "util/exception.hh"
 
diff --git a/contrib/other-builds/moses2/System.h b/contrib/other-builds/moses2/System.h
index f2385ac12..4377597bc 100644
--- a/contrib/other-builds/moses2/System.h
+++ b/contrib/other-builds/moses2/System.h
@@ -7,7 +7,7 @@
 
 #pragma once
 #include <vector>
-#include "FeatureFunctions.h"
+#include "FF/FeatureFunctions.h"
 #include "Weights.h"
 #include "MemPool.h"
 #include "moses/FactorCollection.h"
diff --git a/contrib/other-builds/moses2/TargetPhrase.cpp b/contrib/other-builds/moses2/TargetPhrase.cpp
index d92b30c68..6a47718fc 100644
--- a/contrib/other-builds/moses2/TargetPhrase.cpp
+++ b/contrib/other-builds/moses2/TargetPhrase.cpp
@@ -8,9 +8,9 @@
 #include <stdlib.h>
 #include "TargetPhrase.h"
 #include "Scores.h"
-#include "Manager.h"
 #include "System.h"
 #include "MemPool.h"
+#include "Search/Manager.h"
 
 using namespace std;
 
diff --git a/contrib/other-builds/moses2/Weights.cpp b/contrib/other-builds/moses2/Weights.cpp
index e51d394ea..c70c796ee 100644
--- a/contrib/other-builds/moses2/Weights.cpp
+++ b/contrib/other-builds/moses2/Weights.cpp
@@ -7,8 +7,8 @@
 #include <cassert>
 #include <string>
 #include <vector>
-#include "FeatureFunction.h"
-#include "FeatureFunctions.h"
+#include "FF/FeatureFunction.h"
+#include "FF/FeatureFunctions.h"
 #include "Weights.h"
 #include "moses/Util.h"