Restruct name space