diff --git a/Makefile b/Makefile
index 5a77bea191ba64617e3837654a2177210ecd7dad..4a5f1990b27511e9db4f4b97a38630d0782bfcc4 100644
--- a/Makefile
+++ b/Makefile
@@ -24,7 +24,7 @@
 .PHONY: clean
 
 SRCDIR=./src
-INCDIR=./inc
+INCDIR=./src
 OBJDIR=./obj
 LIBDIR=./lib
 
diff --git a/lib/libFOAM2CSR.so b/lib/libFOAM2CSR.so
deleted file mode 100755
index c656be86c52ef3ca95eaa2da5fd44058ad09a2ec..0000000000000000000000000000000000000000
Binary files a/lib/libFOAM2CSR.so and /dev/null differ
diff --git a/obj/AmgXSolver.o b/obj/AmgXSolver.o
deleted file mode 100644
index e0be2885222906a06ff32184b0e2037c5866a88d..0000000000000000000000000000000000000000
Binary files a/obj/AmgXSolver.o and /dev/null differ
diff --git a/obj/FOAM2CSR.o b/obj/FOAM2CSR.o
deleted file mode 100644
index 1b32218a53f19bdc5ff7d13225349f37c934b531..0000000000000000000000000000000000000000
Binary files a/obj/FOAM2CSR.o and /dev/null differ
diff --git a/obj/consolidate.o b/obj/consolidate.o
deleted file mode 100644
index f5903af2347b8fafbc93b758fe86989617e2b1e1..0000000000000000000000000000000000000000
Binary files a/obj/consolidate.o and /dev/null differ
diff --git a/obj/init.o b/obj/init.o
deleted file mode 100644
index 5f1e110602f995a95415a394a40e71fafb65e1de..0000000000000000000000000000000000000000
Binary files a/obj/init.o and /dev/null differ
diff --git a/obj/misc.o b/obj/misc.o
deleted file mode 100644
index f32ef13cdd1b650d6df20eca979d95c9ae0a25e2..0000000000000000000000000000000000000000
Binary files a/obj/misc.o and /dev/null differ
diff --git a/obj/setA.o b/obj/setA.o
deleted file mode 100644
index d5f6dcf0d0a25de17fe8eb25faea1d8855af1fab..0000000000000000000000000000000000000000
Binary files a/obj/setA.o and /dev/null differ
diff --git a/obj/solve.o b/obj/solve.o
deleted file mode 100644
index 4761a1be53412ff49bc53dd1534ec2b76dde103d..0000000000000000000000000000000000000000
Binary files a/obj/solve.o and /dev/null differ
diff --git a/inc/AmgXSolver.H b/src/AmgXSolver.H
similarity index 100%
rename from inc/AmgXSolver.H
rename to src/AmgXSolver.H
diff --git a/inc/FOAM2CSR.H b/src/FOAM2CSR.H
similarity index 100%
rename from inc/FOAM2CSR.H
rename to src/FOAM2CSR.H