rename
fixed error of undefined class/module
modified namespace
fixed toplevel difinition of namespace