diff --git a/.cproject b/.cproject
index a69893058..3aa628e79 100644
--- a/.cproject
+++ b/.cproject
@@ -1278,14 +1278,6 @@
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
-			<target name="testBAD.run" path="build/gtsam_unstable/base/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
-				<buildCommand>make</buildCommand>
-				<buildArguments>-j5</buildArguments>
-				<buildTarget>testBAD.run</buildTarget>
-				<stopOnError>true</stopOnError>
-				<useDefaultCommand>true</useDefaultCommand>
-				<runAllBuilders>true</runAllBuilders>
-			</target>
 			<target name="all" path="slam" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments>-j2</buildArguments>
@@ -2529,6 +2521,14 @@
 				<useDefaultCommand>true</useDefaultCommand>
 				<runAllBuilders>true</runAllBuilders>
 			</target>
+			<target name="testExpression.run" path="build/gtsam_unstable/nonlinear/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
+				<buildCommand>make</buildCommand>
+				<buildArguments>-j5</buildArguments>
+				<buildTarget>testExpression.run</buildTarget>
+				<stopOnError>true</stopOnError>
+				<useDefaultCommand>true</useDefaultCommand>
+				<runAllBuilders>true</runAllBuilders>
+			</target>
 			<target name="testGaussianFactor.run" path="build/linear/tests" targetID="org.eclipse.cdt.build.MakeTargetBuilder">
 				<buildCommand>make</buildCommand>
 				<buildArguments>-j2</buildArguments>
diff --git a/gtsam_unstable/nonlinear/BADFactor.h b/gtsam_unstable/nonlinear/BADFactor.h
index e8d32cd08..3afb3cc7e 100644
--- a/gtsam_unstable/nonlinear/BADFactor.h
+++ b/gtsam_unstable/nonlinear/BADFactor.h
@@ -17,7 +17,7 @@
  * @brief Expressions for Block Automatic Differentiation
  */
 
-#include <gtsam_unstable/base/Expression.h>
+#include <gtsam_unstable/nonlinear/Expression.h>
 #include <gtsam/nonlinear/NonlinearFactor.h>
 
 namespace gtsam {
diff --git a/gtsam_unstable/base/Expression-inl.h b/gtsam_unstable/nonlinear/Expression-inl.h
similarity index 100%
rename from gtsam_unstable/base/Expression-inl.h
rename to gtsam_unstable/nonlinear/Expression-inl.h
diff --git a/gtsam_unstable/base/Expression.h b/gtsam_unstable/nonlinear/Expression.h
similarity index 100%
rename from gtsam_unstable/base/Expression.h
rename to gtsam_unstable/nonlinear/Expression.h
diff --git a/gtsam_unstable/base/tests/testBAD.cpp b/gtsam_unstable/nonlinear/tests/testExpression.cpp
similarity index 97%
rename from gtsam_unstable/base/tests/testBAD.cpp
rename to gtsam_unstable/nonlinear/tests/testExpression.cpp
index 207afa85e..2d60400e9 100644
--- a/gtsam_unstable/base/tests/testBAD.cpp
+++ b/gtsam_unstable/nonlinear/tests/testExpression.cpp
@@ -10,7 +10,7 @@
  * -------------------------------------------------------------------------- */
 
 /**
- * @file testBAD.cpp
+ * @file testExpression.cpp
  * @date September 18, 2014
  * @author Frank Dellaert
  * @author Paul Furgale
@@ -20,7 +20,7 @@
 #include <gtsam/geometry/PinholeCamera.h>
 #include <gtsam/geometry/Pose3.h>
 #include <gtsam/geometry/Cal3_S2.h>
-#include <gtsam_unstable/base/Expression.h>
+#include <gtsam_unstable/nonlinear/Expression.h>
 #include <gtsam/base/Testable.h>
 
 #include <CppUnitLite/TestHarness.h>