Changes to structure of repo