restructured project, changed makefile