structure project and some cleanup