Fixing Repository Structure