Reorganizing directory structure to start building better Makefiles
I guess I have some slightly better Makefiles now