Fix namespaces for Models

Also described in #9