Changed directory structure, removed makefiles

At some point later makefiles will be put back up.