Starting again after a while.
Changed directory structure and added a Makefile.
I messed up branching, trying to fix it.