Rearranging file structure of repo