restructure/clean up of project