restructure the project
finish cleaning up project