clean up and directory structure changes