Fix name/value to key=>value converter for numeric keys; move models to new Model namespace.