renaming folders in line with namespace