Restructured Database namespace files.