Added New makefile with origanized dir structure