Reorganised build