Re-organised file structure