adjust namespaces, initial changes to refector for core ext