Rename name space to match new folder structure