Rearrange project and add makefile