The project lives!
rearranging and cleaning