Reorganize namespce