Improved repo layout