Rewrote makefiles
Merge branch 'rewrite-make-system'