Cleaning up the project to get it functioning with a new structure.