cleaning up workspace, renaming folders
more cleanup