Prettier makefile
Reorg