Reogranizing the repository file structure