Change project layout
Fix name
Fix script and makefile according to the new project layout