added makefile and modified project structure