Messing about with git, trying to get a better structure