Reorganised file structure and changed associated references.