Re-organised directory structure.