Restructured the file heirarchy and made a smater makefile.