rework repo organization