massive refactoring, complete subject and field namespaces