Added directory structure and changed the makefile