Reorganised repo