reorganised file placements