Move new interfaces to separate files and fix namespaces