reorganised file structure