fixed: namespaces
removed: unused classes