Reorganised filesystem to reflect final structure