diff --git a/src/Makefile b/src/Makefile
index 1c18886..6f3c185 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,6 +1,7 @@
-all: gp.c machine.c fitmult.c fitexternal.c
-	gcc -O2 gp.c machine.c fitmult.c fitexternal.c -o gp
+all: core 
 
+core: gp.c machine.c fitmult.c fitexternal.c
+	gcc -O2 gp.c machine.c fitmult.c fitexternal.c -o gp
 
 clean:
-	rm -f gp *~ *.o
+	rm -f gp *~ *.o *.so
diff --git a/src/fitlibs/fitmult.c b/src/fitmult.c
similarity index 100%
rename from src/fitlibs/fitmult.c
rename to src/fitmult.c
diff --git a/src/fitlibs/fitmult.h b/src/fitmult.h
similarity index 100%
rename from src/fitlibs/fitmult.h
rename to src/fitmult.h