Re-order project
Fix Makefile