diff --git a/README.md b/README.md
index d6506c3a..54496c7b 100644
--- a/README.md
+++ b/README.md
@@ -168,15 +168,15 @@ These instructions will get you a copy of the project up and running on your loc
 ### Directory Organization
 * [root directory for Lantern](./src)
   * [Lantern code directory](./src/main/scala/lantern)
-    * [code for AD on scalar variable](./src/main/scala/lantern/ad_lms.scala)
-    * [code for AD on vector and tensor](./src/main/scala/lantern/ad_lms_vector.scala)
-    * [LMS framework code](./src/main/scala/lantern/dslapi.scala)
-    * [data loader](./src/main/scala/lantern/scanner.scala)
+    * [code for AD on scalar variable](src/main/scala/lantern/ScalarDifferentiation.scala)
+    * [code for AD on vector and tensor](src/main/scala/lantern/TensorDifferentiation.scala)
+    * [LMS framework code](src/main/scala/lantern/DslAPI.scala)
+    * [data loader](src/main/scala/lantern/Scanner.scala)
   * [Lantern test directory](./src/test/scala/lantern)
-      * [ScalaTest instance of RNN evaluation](./src/test/scala/lantern/vanillaRNN.scala)
-      * [ScalaTest instance of LSTM evaluation](./src/test/scala/lantern/LSTM.scala)
-      * [ScalaTest instance of TreeLSTM evaluation](./src/test/scala/lantern/sentimentTreeLSTM.scala)
-      * [ScalaTest instance of CNN evaluation](./src/test/scala/lantern/mnistCNN.scala)
+      * [ScalaTest instance of RNN evaluation](src/test/scala/lantern/TestVanillaRNN.scala)
+      * [ScalaTest instance of LSTM evaluation](src/test/scala/lantern/LSTMTest.scala)
+      * [ScalaTest instance of TreeLSTM evaluation](src/test/scala/lantern/SentimentTreeLSTMTest.scala)
+      * [ScalaTest instance of CNN evaluation](src/test/scala/lantern/MnistCNNTest.scala)
   * [directory for evaluation code](./src/out/ICFP18evaluation)
       * [directory for RNN evaluation code](./src/out/ICFP18evaluation/evaluationRNN)
       * [directory for LSTM evaluation code](./src/out/ICFP18evaluation/evaluationLSTM)
diff --git a/src/main/scala/lantern/dslapi.scala b/src/main/scala/lantern/DslAPI.scala
similarity index 100%
rename from src/main/scala/lantern/dslapi.scala
rename to src/main/scala/lantern/DslAPI.scala
diff --git a/src/main/scala/lantern/future.scala b/src/main/scala/lantern/Future.scala
similarity index 100%
rename from src/main/scala/lantern/future.scala
rename to src/main/scala/lantern/Future.scala
diff --git a/src/main/scala/lantern/nnModule.scala b/src/main/scala/lantern/NNModule.scala
similarity index 100%
rename from src/main/scala/lantern/nnModule.scala
rename to src/main/scala/lantern/NNModule.scala
diff --git a/src/main/scala/lantern/onnxLib.scala b/src/main/scala/lantern/ONNXLib.scala
similarity index 100%
rename from src/main/scala/lantern/onnxLib.scala
rename to src/main/scala/lantern/ONNXLib.scala
diff --git a/src/main/scala/lantern/ad_lms.scala b/src/main/scala/lantern/ScalarDifferentiation.scala
similarity index 100%
rename from src/main/scala/lantern/ad_lms.scala
rename to src/main/scala/lantern/ScalarDifferentiation.scala
diff --git a/src/main/scala/lantern/scanner.scala b/src/main/scala/lantern/Scanner.scala
similarity index 100%
rename from src/main/scala/lantern/scanner.scala
rename to src/main/scala/lantern/Scanner.scala
diff --git a/src/main/scala/lantern/ad_lms_vector.scala b/src/main/scala/lantern/TensorDifferentiation.scala
similarity index 100%
rename from src/main/scala/lantern/ad_lms_vector.scala
rename to src/main/scala/lantern/TensorDifferentiation.scala
diff --git a/src/test/scala/lantern/LSTM.scala b/src/test/scala/lantern/LSTMTest.scala
similarity index 100%
rename from src/test/scala/lantern/LSTM.scala
rename to src/test/scala/lantern/LSTMTest.scala
diff --git a/src/test/scala/lantern/mnistCNN.scala b/src/test/scala/lantern/MnistCNNTest.scala
similarity index 100%
rename from src/test/scala/lantern/mnistCNN.scala
rename to src/test/scala/lantern/MnistCNNTest.scala
diff --git a/src/test/scala/lantern/sentimentLSTM.scala b/src/test/scala/lantern/SentimentLSTMTest.scala
similarity index 100%
rename from src/test/scala/lantern/sentimentLSTM.scala
rename to src/test/scala/lantern/SentimentLSTMTest.scala
diff --git a/src/test/scala/lantern/sentimentRNN.scala b/src/test/scala/lantern/SentimentRNNTest.scala
similarity index 100%
rename from src/test/scala/lantern/sentimentRNN.scala
rename to src/test/scala/lantern/SentimentRNNTest.scala
diff --git a/src/test/scala/lantern/sentimentTreeLSTM.scala b/src/test/scala/lantern/SentimentTreeLSTMTest.scala
similarity index 100%
rename from src/test/scala/lantern/sentimentTreeLSTM.scala
rename to src/test/scala/lantern/SentimentTreeLSTMTest.scala
diff --git a/src/test/scala/lantern/ad_hessian.scala b/src/test/scala/lantern/TestAdHessian.scala
similarity index 100%
rename from src/test/scala/lantern/ad_hessian.scala
rename to src/test/scala/lantern/TestAdHessian.scala
diff --git a/src/test/scala/lantern/ad_jacobian.scala b/src/test/scala/lantern/TestAdJacobian.scala
similarity index 100%
rename from src/test/scala/lantern/ad_jacobian.scala
rename to src/test/scala/lantern/TestAdJacobian.scala
diff --git a/src/test/scala/lantern/ad_shiftreset.scala b/src/test/scala/lantern/TestAdShiftReset.scala
similarity index 99%
rename from src/test/scala/lantern/ad_shiftreset.scala
rename to src/test/scala/lantern/TestAdShiftReset.scala
index 61c79456..e1d84d32 100644
--- a/src/test/scala/lantern/ad_shiftreset.scala
+++ b/src/test/scala/lantern/TestAdShiftReset.scala
@@ -119,7 +119,7 @@ object ShiftReset {
     assert (gradient_if == gfif(2.4, 3.9))   
 
     println("Step 2b")
-    // Function with if-statement (like the one in ad_lms.scala)
+    // Function with if-statement (like the one in ScalarDifferentiation.scala)
     def fif2(x: Num): Num @diff = {
       if (x > 0.0) x * x else -1.0 * x * x
     }
diff --git a/src/test/scala/lantern/test_broadcast.scala b/src/test/scala/lantern/TestBroadcast.scala
similarity index 100%
rename from src/test/scala/lantern/test_broadcast.scala
rename to src/test/scala/lantern/TestBroadcast.scala
diff --git a/src/test/scala/lantern/test_future.scala b/src/test/scala/lantern/TestFuture.scala
similarity index 100%
rename from src/test/scala/lantern/test_future.scala
rename to src/test/scala/lantern/TestFuture.scala
diff --git a/src/test/scala/lantern/LanternFunSuite.scala b/src/test/scala/lantern/TestLanternFunSuite.scala
similarity index 100%
rename from src/test/scala/lantern/LanternFunSuite.scala
rename to src/test/scala/lantern/TestLanternFunSuite.scala
diff --git a/src/test/scala/lantern/test_nnmodule.scala b/src/test/scala/lantern/TestNNModule.scala
similarity index 100%
rename from src/test/scala/lantern/test_nnmodule.scala
rename to src/test/scala/lantern/TestNNModule.scala
diff --git a/src/test/scala/lantern/test_onnx.scala b/src/test/scala/lantern/TestONNX.scala
similarity index 100%
rename from src/test/scala/lantern/test_onnx.scala
rename to src/test/scala/lantern/TestONNX.scala
diff --git a/src/test/scala/lantern/test_ad_lms.scala b/src/test/scala/lantern/TestScalarDifferentiation.scala
similarity index 100%
rename from src/test/scala/lantern/test_ad_lms.scala
rename to src/test/scala/lantern/TestScalarDifferentiation.scala
diff --git a/src/test/scala/lantern/test_ad_lms_vector.scala b/src/test/scala/lantern/TestTensorDifferentiation.scala
similarity index 100%
rename from src/test/scala/lantern/test_ad_lms_vector.scala
rename to src/test/scala/lantern/TestTensorDifferentiation.scala
diff --git a/src/test/scala/lantern/vanillaRNN.scala b/src/test/scala/lantern/TestVanillaRNN.scala
similarity index 100%
rename from src/test/scala/lantern/vanillaRNN.scala
rename to src/test/scala/lantern/TestVanillaRNN.scala
diff --git a/src/test/scala/lantern/vanillaRNNList.scala b/src/test/scala/lantern/TestVanillaRNNList.scala
similarity index 100%
rename from src/test/scala/lantern/vanillaRNNList.scala
rename to src/test/scala/lantern/TestVanillaRNNList.scala