Folder Name Changes & Namespaces changes