Rearranged directories to be more github-y. Related mod's of Makefiles.