Tidying up the project