Project restructured. Rewrote makefile