Cutting this repo into smaller pieces