re-organised file structure