diff --git a/majel/Makefile b/majel/Makefile
deleted file mode 100644
index 403c1d3a6ae81fddd6f89977fe930211334156b8..0000000000000000000000000000000000000000
--- a/majel/Makefile
+++ /dev/null
@@ -1,10 +0,0 @@
-CCFLAGS = -std=c++11 -I/work/paddle
-CC = nvcc
-
-all : place_test
-
-place.o : place.h place.cu
-	$(CC) $(CCFLAGS) -c place.cu -o $@
-
-place_test : place.o place_test.cu
-	$(CC) $(CCFLAGS) -lgtest -lgtest_main $^ -o $@
diff --git a/majel/place.cu b/paddle/majel/place.cpp
similarity index 97%
rename from majel/place.cu
rename to paddle/majel/place.cpp
index ee84e96048d549a3e87bca6712702105a904de71..396534b84b5ee9945f1c6da002cff5aee26e6a55 100644
--- a/majel/place.cu
+++ b/paddle/majel/place.cpp
@@ -1,4 +1,4 @@
-#include <majel/place.h>
+#include "majel/place.h"
 
 namespace majel {
 
diff --git a/majel/place.h b/paddle/majel/place.h
similarity index 100%
rename from majel/place.h
rename to paddle/majel/place.h
diff --git a/majel/place_test.cu b/paddle/majel/test/place_test.cpp
similarity index 100%
rename from majel/place_test.cu
rename to paddle/majel/test/place_test.cpp
diff --git a/paddle/majel/test/test_framework.cpp b/paddle/majel/test/test_framework.cpp
new file mode 100644
index 0000000000000000000000000000000000000000..a62216ba85cdd1fd944c2ac5f2534009f4089f3e
--- /dev/null
+++ b/paddle/majel/test/test_framework.cpp
@@ -0,0 +1,6 @@
+#include "gtest/gtest.h"
+
+int main(int argc, char** argv) {
+    ::testing::InitGoogleTest(&argc, argv);
+    return RUN_ALL_TESTS();
+}