renamed some folders and more cleanup