Rewrote Makefile
New directory layout