Folder renaming
Old folders removed