Redo directory structure, add makefile