Tidy up the repo structure