diff --git a/gtsam/base/CMakeLists.txt b/gtsam/base/CMakeLists.txt
index 66d3ec721..99984e7b3 100644
--- a/gtsam/base/CMakeLists.txt
+++ b/gtsam/base/CMakeLists.txt
@@ -5,5 +5,8 @@ install(FILES ${base_headers} DESTINATION include/gtsam/base)
 file(GLOB base_headers_tree "treeTraversal/*.h")
 install(FILES ${base_headers_tree} DESTINATION include/gtsam/base/treeTraversal)
 
+file(GLOB deprecated_headers "deprecated/*.h")
+install(FILES ${deprecated_headers} DESTINATION include/gtsam/base/deprecated)
+
 # Build tests
 add_subdirectory(tests)
diff --git a/gtsam/base/LieMatrix.cpp b/gtsam/base/LieMatrix.cpp
index cf5b57536..ff4176df1 100644
--- a/gtsam/base/LieMatrix.cpp
+++ b/gtsam/base/LieMatrix.cpp
@@ -15,7 +15,7 @@
  * @author Richard Roberts and Alex Cunningham
  */
 
-#include <gtsam/base/LieMatrix_Deprecated.h>
+#include <gtsam/base/deprecated/LieMatrix_Deprecated.h>
 
 namespace gtsam {
 
diff --git a/gtsam/base/LieScalar.cpp b/gtsam/base/LieScalar.cpp
index 4c5a6a257..71f4992c2 100644
--- a/gtsam/base/LieScalar.cpp
+++ b/gtsam/base/LieScalar.cpp
@@ -8,7 +8,7 @@
 
 
 
-#include <gtsam/base/LieScalar_Deprecated.h>
+#include <gtsam/base/deprecated/LieScalar_Deprecated.h>
 
 namespace gtsam {
   void LieScalar::print(const std::string& name) const {
diff --git a/gtsam/base/LieVector.cpp b/gtsam/base/LieVector.cpp
index 3e4eeecf2..788e8059c 100644
--- a/gtsam/base/LieVector.cpp
+++ b/gtsam/base/LieVector.cpp
@@ -15,7 +15,7 @@
  * @author Alex Cunningham
  */
 
-#include <gtsam/base/LieVector_Deprecated.h>
+#include <gtsam/base/deprecated/LieVector_Deprecated.h>
 #include <cstdarg>
 
 using namespace std;
diff --git a/gtsam/base/LieVector.h b/gtsam/base/LieVector.h
index 813431775..c4f2af1a9 100644
--- a/gtsam/base/LieVector.h
+++ b/gtsam/base/LieVector.h
@@ -23,4 +23,4 @@
 #warning "LieVector.h is deprecated. Please use Eigen::Vector instead."
 #endif
 
-#include <gtsam/base/LieVector_Deprecated.h>
+#include <gtsam/base/deprecated/LieVector_Deprecated.h>
diff --git a/gtsam/base/LieMatrix_Deprecated.h b/gtsam/base/deprecated/LieMatrix_Deprecated.h
similarity index 100%
rename from gtsam/base/LieMatrix_Deprecated.h
rename to gtsam/base/deprecated/LieMatrix_Deprecated.h
diff --git a/gtsam/base/LieScalar_Deprecated.h b/gtsam/base/deprecated/LieScalar_Deprecated.h
similarity index 100%
rename from gtsam/base/LieScalar_Deprecated.h
rename to gtsam/base/deprecated/LieScalar_Deprecated.h
diff --git a/gtsam/base/LieVector_Deprecated.h b/gtsam/base/deprecated/LieVector_Deprecated.h
similarity index 100%
rename from gtsam/base/LieVector_Deprecated.h
rename to gtsam/base/deprecated/LieVector_Deprecated.h
diff --git a/gtsam/base/tests/testLieMatrix.cpp b/gtsam/base/tests/testLieMatrix.cpp
index 09caadabd..9c39e5342 100644
--- a/gtsam/base/tests/testLieMatrix.cpp
+++ b/gtsam/base/tests/testLieMatrix.cpp
@@ -15,8 +15,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/LieMatrix_Deprecated.h>
-
+#include <gtsam/base/deprecated/LieMatrix_Deprecated.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/Manifold.h>
 
diff --git a/gtsam/base/tests/testLieScalar.cpp b/gtsam/base/tests/testLieScalar.cpp
index 07e666fbe..121a7949b 100644
--- a/gtsam/base/tests/testLieScalar.cpp
+++ b/gtsam/base/tests/testLieScalar.cpp
@@ -15,8 +15,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/LieScalar_Deprecated.h>
-
+#include <gtsam/base/deprecated/LieScalar_Deprecated.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/Manifold.h>
 
diff --git a/gtsam/base/tests/testLieVector.cpp b/gtsam/base/tests/testLieVector.cpp
index ed3afac8c..3980fef52 100644
--- a/gtsam/base/tests/testLieVector.cpp
+++ b/gtsam/base/tests/testLieVector.cpp
@@ -15,8 +15,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/LieVector_Deprecated.h>
-
+#include <gtsam/base/deprecated/LieVector_Deprecated.h>
 #include <gtsam/base/Testable.h>
 #include <gtsam/base/Manifold.h>
 
diff --git a/gtsam/base/tests/testTestableAssertions.cpp b/gtsam/base/tests/testTestableAssertions.cpp
index 364834e2a..4dbc7eb5c 100644
--- a/gtsam/base/tests/testTestableAssertions.cpp
+++ b/gtsam/base/tests/testTestableAssertions.cpp
@@ -15,8 +15,7 @@
  */
 
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/LieScalar_Deprecated.h>
-
+#include <gtsam/base/deprecated/LieScalar_Deprecated.h>
 #include <gtsam/base/TestableAssertions.h>
 
 using namespace gtsam;
diff --git a/gtsam_unstable/slam/serialization.cpp b/gtsam_unstable/slam/serialization.cpp
index a598fb689..3cbbcc3a3 100644
--- a/gtsam_unstable/slam/serialization.cpp
+++ b/gtsam_unstable/slam/serialization.cpp
@@ -5,8 +5,8 @@
  * @author Alex Cunningham
  */
 
-#include <gtsam/base/LieMatrix_Deprecated.h>
-#include <gtsam/base/LieVector_Deprecated.h>
+#include <gtsam/base/deprecated/LieMatrix_Deprecated.h>
+#include <gtsam/base/deprecated/LieVector_Deprecated.h>
 #include <gtsam/slam/serialization.h>
 #include <gtsam/base/serialization.h>
 
diff --git a/gtsam_unstable/slam/tests/testGaussMarkov1stOrderFactor.cpp b/gtsam_unstable/slam/tests/testGaussMarkov1stOrderFactor.cpp
index a86306a8d..c83ce1c60 100644
--- a/gtsam_unstable/slam/tests/testGaussMarkov1stOrderFactor.cpp
+++ b/gtsam_unstable/slam/tests/testGaussMarkov1stOrderFactor.cpp
@@ -21,7 +21,7 @@
 #include <gtsam/inference/Key.h>
 #include <gtsam/base/numericalDerivative.h>
 #include <CppUnitLite/TestHarness.h>
-#include <gtsam/base/LieVector_Deprecated.h>
+#include <gtsam/base/deprecated/LieVector_Deprecated.h>
 
 using namespace std;
 using namespace gtsam;
diff --git a/tests/testGaussianISAM2.cpp b/tests/testGaussianISAM2.cpp
index 7922c14d1..613dd9d27 100644
--- a/tests/testGaussianISAM2.cpp
+++ b/tests/testGaussianISAM2.cpp
@@ -25,7 +25,7 @@
 #include <gtsam/base/treeTraversal-inst.h>
 #include <boost/foreach.hpp>
 #include <boost/assign/list_of.hpp>
-#include <gtsam/base/LieScalar_Deprecated.h>
+#include <gtsam/base/deprecated/LieScalar_Deprecated.h>
 using namespace boost::assign;
 #include <boost/range/adaptor/map.hpp>
 namespace br { using namespace boost::adaptors; using namespace boost::range; }