changing folder names and fixing minors