Change namespaces and folders
Change namespaces and folders