Changed the directory structure to be more traditional.
Re-did the makefile in order to match the new directory structure