re-organised file layout