changed namespaces and model classes (again)