Added makefile, reorganized directory structure
Added makefile, reorganized directory structure