source code organization push, updated makefile