diff --git a/gtsam/base/LieMatrix.cpp b/gtsam/base/LieMatrix.cpp
deleted file mode 100644
index ff4176df1..000000000
--- a/gtsam/base/LieMatrix.cpp
+++ /dev/null
@@ -1,27 +0,0 @@
-/* ----------------------------------------------------------------------------
-
- * GTSAM Copyright 2010, Georgia Tech Research Corporation, 
- * Atlanta, Georgia 30332-0415
- * All Rights Reserved
- * Authors: Frank Dellaert, et al. (see THANKS for the full author list)
-
- * See LICENSE for the license information
-
- * -------------------------------------------------------------------------- */
-
-/**
- * @file LieMatrix.cpp
- * @brief A wrapper around Matrix providing Lie compatibility
- * @author Richard Roberts and Alex Cunningham
- */
-
-#include <gtsam/base/deprecated/LieMatrix_Deprecated.h>
-
-namespace gtsam {
-
-/* ************************************************************************* */
-void LieMatrix::print(const std::string& name) const {
-  gtsam::print(matrix(), name);
-}
-
-}
diff --git a/gtsam/base/LieMatrix.h b/gtsam/base/LieMatrix.h
index e24f339e4..77edd5fd5 100644
--- a/gtsam/base/LieMatrix.h
+++ b/gtsam/base/LieMatrix.h
@@ -11,7 +11,7 @@
 
 /**
  * @file LieMatrix.h
- * @brief External deprecation warning, see LieMatrix_Deprecated.h for details
+ * @brief External deprecation warning, see deprecated/LieMatrix.h for details
  * @author Paul Drews
  */
 
@@ -23,4 +23,4 @@
 #warning "LieMatrix.h is deprecated. Please use Eigen::Matrix instead."
 #endif
 
-#include "gtsam/base/LieMatrix_Deprecated.h"
+#include "gtsam/base/deprecated/LieMatrix.h"
diff --git a/gtsam/base/LieScalar.cpp b/gtsam/base/LieScalar.cpp
deleted file mode 100644
index 71f4992c2..000000000
--- a/gtsam/base/LieScalar.cpp
+++ /dev/null
@@ -1,17 +0,0 @@
-/*
- * LieScalar.cpp
- *
- *  Created on: Apr 12, 2013
- *      Author: thduynguyen
- */
-
-
-
-
-#include <gtsam/base/deprecated/LieScalar_Deprecated.h>
-
-namespace gtsam {
-  void LieScalar::print(const std::string& name) const {
-    std::cout << name << ": " << d_ << std::endl;
-  }
-}
diff --git a/gtsam/base/LieScalar.h b/gtsam/base/LieScalar.h
index 650e2bb21..417570604 100644
--- a/gtsam/base/LieScalar.h
+++ b/gtsam/base/LieScalar.h
@@ -11,7 +11,7 @@
 
 /**
  * @file LieScalar.h
- * @brief External deprecation warning, see LieScalar_Deprecated.h for details
+ * @brief External deprecation warning, see deprecated/LieScalar.h for details
  * @author Kai Ni
  */
 
@@ -23,4 +23,4 @@
   #warning "LieScalar.h is deprecated. Please use double/float instead."
 #endif
 
-#include <gtsam/base/LieScalar_Deprecated.h>
+#include <gtsam/base/deprecated/LieScalar.h>
diff --git a/gtsam/base/LieVector.cpp b/gtsam/base/LieVector.cpp
deleted file mode 100644
index 788e8059c..000000000
--- a/gtsam/base/LieVector.cpp
+++ /dev/null
@@ -1,40 +0,0 @@
-/* ----------------------------------------------------------------------------
-
- * GTSAM Copyright 2010, Georgia Tech Research Corporation, 
- * Atlanta, Georgia 30332-0415
- * All Rights Reserved
- * Authors: Frank Dellaert, et al. (see THANKS for the full author list)
-
- * See LICENSE for the license information
-
- * -------------------------------------------------------------------------- */
-
-/**
- * @file LieVector.cpp
- * @brief Implementations for LieVector functions
- * @author Alex Cunningham
- */
-
-#include <gtsam/base/deprecated/LieVector_Deprecated.h>
-#include <cstdarg>
-
-using namespace std;
-
-namespace gtsam {
-
-/* ************************************************************************* */
-LieVector::LieVector(size_t m, const double* const data)
-: Vector(m)
-{
-  for(size_t i = 0; i < m; i++)
-    (*this)(i) = data[i];
-}
-
-/* ************************************************************************* */
-void LieVector::print(const std::string& name) const {
-  gtsam::print(vector(), name);
-}
-
-// Does not compile because LieVector is not fixed size.
-// GTSAM_CONCEPT_LIE_INST(LieVector)
-} // \namespace gtsam
diff --git a/gtsam/base/LieVector.h b/gtsam/base/LieVector.h
index c4f2af1a9..310abcf02 100644
--- a/gtsam/base/LieVector.h
+++ b/gtsam/base/LieVector.h
@@ -11,7 +11,7 @@
 
 /**
  * @file LieVector.h
- * @brief Deprecation warning for LieVector_Deprecated.h, see LieVector_Deprecated.h for details.
+ * @brief Deprecation warning for LieVector, see deprecated/LieVector.h for details.
  * @author Paul Drews
  */
 
@@ -23,4 +23,4 @@
 #warning "LieVector.h is deprecated. Please use Eigen::Vector instead."
 #endif
 
-#include <gtsam/base/deprecated/LieVector_Deprecated.h>
+#include <gtsam/base/deprecated/LieVector.h>