diff --git a/build.gradle b/build.gradle
index 4588cc4c..79b7fe1f 100644
--- a/build.gradle
+++ b/build.gradle
@@ -37,18 +37,27 @@ minecraft {
 
 sourceSets {
     hdskins {
+        java {
+            srcDirs "src/hdskins/java", "src/common/java"
+        }
+        resources {
+            srcDirs "src/hdskins/resources"
+        }
+        refMap = 'hdskins.mixin.refmap.json'
+        
         compileClasspath += main.compileClasspath
-				compileClasspath += common.compileClasspath
-        ext.refMap = 'hdskins.mixin.refmap.json'
     }
     main {
+        java {
+            srcDirs "src/main/java", "src/common/java"
+        }
+        resources {
+            srcDirs "src/main/resources"
+        }
+        refMap = 'minelp.mixin.refmap.json'
+        
         compileClasspath += hdskins.output
-				compileClasspath += common.output
-        ext.refMap = 'minelp.mixin.refmap.json'
     }
-		common {
-				
-		}
 }
 
 dependencies {
diff --git a/build.number b/build.number
index a647a8ff..63ad63f3 100644
--- a/build.number
+++ b/build.number
@@ -1,4 +1,4 @@
 #Build Number for ANT. Do not edit!
-#Sun Jul 08 20:46:02 CAT 2018
-build.number=500
->>>>>>> Build number pls
+#Tue Jul 31 09:26:02 CAT 2018
+build.number=501
+>>>>>>>=Build number pls