Change namespaces to structs for Models (broken)