Improved repository folder structure