Change directory

Add makefile, improve the directory structure.