Moved model parsers and primitive into subfolder