Move gitignore and makefile back and do nested make