Reorganised everything, ready for the project to be reused for something else.