diff --git a/gtsam/discrete/TypedDiscreteFactor.cpp b/gtsam/unstable/discrete/TypedDiscreteFactor.cpp
similarity index 97%
rename from gtsam/discrete/TypedDiscreteFactor.cpp
rename to gtsam/unstable/discrete/TypedDiscreteFactor.cpp
index 86f902e89..51f3ff791 100644
--- a/gtsam/discrete/TypedDiscreteFactor.cpp
+++ b/gtsam/unstable/discrete/TypedDiscreteFactor.cpp
@@ -5,10 +5,10 @@
  * @date	Mar 5, 2011
  */
 
-#include <boost/make_shared.hpp>
-#include <gtsam/discrete/TypedDiscreteFactor.h>
+#include <gtsam_unstable/discrete/TypedDiscreteFactor.h>
+#include <gtsam/discrete/DecisionTree.h>
 #include <gtsam/inference/Factor-inl.h>
-#include <gtsam/discrete/DecisionDiagram-inl.h>
+#include <boost/make_shared.hpp>
 
 using namespace std;
 
diff --git a/gtsam/discrete/TypedDiscreteFactor.h b/gtsam/unstable/discrete/TypedDiscreteFactor.h
similarity index 96%
rename from gtsam/discrete/TypedDiscreteFactor.h
rename to gtsam/unstable/discrete/TypedDiscreteFactor.h
index 3d9fd6ee6..e6a8b2f32 100644
--- a/gtsam/discrete/TypedDiscreteFactor.h
+++ b/gtsam/unstable/discrete/TypedDiscreteFactor.h
@@ -7,10 +7,10 @@
 
 #pragma once
 
-#include <map>
-#include <gtsam/inference/Factor.h>
 #include <gtsam/discrete/DiscreteFactor.h>
-#include <gtsam/discrete/AlgebraicDecisionDiagram.h>
+#include <gtsam/discrete/AlgebraicDecisionTree.h>
+#include <gtsam/inference/Factor.h>
+#include <map>
 
 namespace gtsam {
 
diff --git a/gtsam/discrete/TypedDiscreteFactorGraph.cpp b/gtsam/unstable/discrete/TypedDiscreteFactorGraph.cpp
similarity index 97%
rename from gtsam/discrete/TypedDiscreteFactorGraph.cpp
rename to gtsam/unstable/discrete/TypedDiscreteFactorGraph.cpp
index 2f8c2d22b..65ffe2cc8 100644
--- a/gtsam/discrete/TypedDiscreteFactorGraph.cpp
+++ b/gtsam/unstable/discrete/TypedDiscreteFactorGraph.cpp
@@ -5,16 +5,15 @@
  * @date	Mar 1, 2011
  */
 
+#include <gtsam_unstable/discrete/TypedDiscreteFactorGraph.h>
+#include <gtsam/discrete/parseUAI.h>
+#include <gtsam/discrete/DiscreteFactor.h>
+#include <gtsam/inference/FactorGraph.h>
+#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
 #include <iostream>
 #include <fstream>
 #include <stdexcept>
-#include <boost/lexical_cast.hpp>
-#include <boost/foreach.hpp>
-#include <gtsam/discrete/DiscreteFactor.h>
-#include <gtsam/discrete/TypedDiscreteFactorGraph.h>
-#include <gtsam/discrete/parseUAI.h>
-
-#include <gtsam/inference/FactorGraph.h>
 
 using namespace std;
 
diff --git a/gtsam/discrete/TypedDiscreteFactorGraph.h b/gtsam/unstable/discrete/TypedDiscreteFactorGraph.h
similarity index 95%
rename from gtsam/discrete/TypedDiscreteFactorGraph.h
rename to gtsam/unstable/discrete/TypedDiscreteFactorGraph.h
index 010113bda..d466358f8 100644
--- a/gtsam/discrete/TypedDiscreteFactorGraph.h
+++ b/gtsam/unstable/discrete/TypedDiscreteFactorGraph.h
@@ -8,10 +8,10 @@
 
 #pragma once
 
+#include <gtsam_unstable/discrete/TypedDiscreteFactor.h>
+#include <gtsam/inference/FactorGraph.h>
 #include <vector>
 #include <set>
-#include <gtsam/inference/FactorGraph.h>
-#include <gtsam/discrete/TypedDiscreteFactor.h>
 
 namespace gtsam {
 
diff --git a/gtsam/discrete/tests/testTypedDiscreteFactor.cpp b/gtsam/unstable/discrete/tests/testTypedDiscreteFactor.cpp
similarity index 96%
rename from gtsam/discrete/tests/testTypedDiscreteFactor.cpp
rename to gtsam/unstable/discrete/tests/testTypedDiscreteFactor.cpp
index af69eab41..6f90dcb22 100644
--- a/gtsam/discrete/tests/testTypedDiscreteFactor.cpp
+++ b/gtsam/unstable/discrete/tests/testTypedDiscreteFactor.cpp
@@ -5,13 +5,12 @@
  * @date	Mar 5, 2011
  */
 
+#include <gtsam_unstable/discrete/TypedDiscreteFactor.h>
+#include <gtsam/base/Testable.h>
+#include <CppUnitLite/TestHarness.h>
 #include <boost/assign/std/vector.hpp>
 using namespace boost::assign;
 
-#include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/Testable.h>
-#include <gtsam/discrete/TypedDiscreteFactor.h>
-
 using namespace std;
 using namespace gtsam;
 
diff --git a/gtsam/discrete/tests/testTypedDiscreteFactorGraph.cpp b/gtsam/unstable/discrete/tests/testTypedDiscreteFactorGraph.cpp
similarity index 96%
rename from gtsam/discrete/tests/testTypedDiscreteFactorGraph.cpp
rename to gtsam/unstable/discrete/tests/testTypedDiscreteFactorGraph.cpp
index 90c4617ba..c0244ec88 100644
--- a/gtsam/discrete/tests/testTypedDiscreteFactorGraph.cpp
+++ b/gtsam/unstable/discrete/tests/testTypedDiscreteFactorGraph.cpp
@@ -6,16 +6,9 @@
  * @date Feb 14, 2011
  */
 
-//#include <map>
-//#include <fstream>
-
-#include <boost/foreach.hpp>
+#include <gtsam_unstable/discrete/TypedDiscreteFactorGraph.h>
 #include <CppUnitLite/TestHarness.h>
-//#include <gtsam/inference/JunctionTree.h>
-//#include <gtsam/inference/JunctionTree-inl.h>
-
-#include <gtsam/discrete/TypedDiscreteFactorGraph.h>
-//#include <gtsam/discrete/DiscreteSequentialSolver.h>
+#include <boost/foreach.hpp>
 
 using namespace std;
 using namespace gtsam;
diff --git a/gtsam/discrete/tests/testTypedDiscreteVariable.cpp b/gtsam/unstable/discrete/tests/testTypedDiscreteVariable.cpp
similarity index 100%
rename from gtsam/discrete/tests/testTypedDiscreteVariable.cpp
rename to gtsam/unstable/discrete/tests/testTypedDiscreteVariable.cpp