New proper makefile
Fix build file structure.