Reorganised and renamed specs