Finished reorganizing project