Fixed repo organization