removed views, changed folder names