diff --git a/Android.mk b/Android.mk
index fd47e87..8806a7c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -19,7 +19,7 @@ LOCAL_PATH := $(call my-dir)
 include $(CLEAR_VARS)
 
 cyanogenmod_app_src := src/java/
-library_src := cm/lib/java/org/cyanogenmod/platform/internal
+library_src := cm/lib/main/java
 
 LOCAL_MODULE := org.cyanogenmod.platform
 LOCAL_MODULE_TAGS := optional
@@ -127,5 +127,3 @@ include $(BUILD_DROIDDOC)
 cmplat.docs.src_files :=
 cmplat.docs.java_libraries :=
 intermediates.COMMON :=
-
-include $(call all-makefiles-under, $(LOCAL_PATH))
diff --git a/cm/lib/androidTest/java/org/cyanogenmod/platform/internal/CMStatusBarManagerTest.java b/cm/lib/androidTest/java/org/cyanogenmod/platform/internal/CMStatusBarManagerTest.java
new file mode 100644
index 0000000..bde226d
--- /dev/null
+++ b/cm/lib/androidTest/java/org/cyanogenmod/platform/internal/CMStatusBarManagerTest.java
@@ -0,0 +1,7 @@
+package org.cyanogenmod.platform.internal;
+
+/**
+ * Created by Adnan on 4/30/15.
+ */
+public class CMStatusBarManagerTest {
+}
diff --git a/cm/lib/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
similarity index 100%
rename from cm/lib/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
rename to cm/lib/main/java/org/cyanogenmod/platform/internal/CMStatusBarManagerService.java
diff --git a/cm/lib/java/org/cyanogenmod/platform/internal/ManagedServices.java b/cm/lib/main/java/org/cyanogenmod/platform/internal/ManagedServices.java
similarity index 100%
rename from cm/lib/java/org/cyanogenmod/platform/internal/ManagedServices.java
rename to cm/lib/main/java/org/cyanogenmod/platform/internal/ManagedServices.java