Whoooops forgot to commit for a while
Starting to divide up the projects