reorganized directory structure and updated makefile