revert that because of namespaces
cleanup and reorganize