Changed up some folder names