Moved files to match namespace dirs
no message