Improve Repository Structure