restructed directory and created new improved Makefile