Updated file structure added Makefiles
Merge