Re-organised file, cleaner layout.