removed unused files, updated namespaces