Moved files around
Updated makefiles to reflect new directory structure