Reorganised everything