diff --git a/.gitignore b/.gitignore
index 6f50b2c68..4d958ca72 100644
--- a/.gitignore
+++ b/.gitignore
@@ -132,6 +132,8 @@ src/main/resources/org/opencds/cqf/tooling/acceleratorkit/output/*
 FHIR-Spec/*
 .flattened-pom.xml
 
+output
+
 core.*
 javacore.*
 jitdump.*
diff --git a/.vscode/launch.json b/.vscode/launch.json
index 390136cc8..46053b16b 100644
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -199,16 +199,19 @@
         },
         {
             "type": "java",
-            "name": "PostBundles to Fhir Uri",
+            "name": "Generate ModelInfo",
             "request": "launch",
-            "mainClass": "jreyno77.com.github.Main",
+            "mainClass": "org.opencds.cqf.tooling.cli.Main",
             "projectName": "tooling-cli",
             "args": [
-                "-PostBundlesInDir",
-                "-dp=../hedis-ig-r4/bundles/MRP-FHIR/MRP-FHIR-files",
-                "-fs=http://localhost:8080/cqf-ruler-r4/fhir",
-                "-fv=fhir4",
-                "-e=json"
+                "-GenerateMIs",
+                "-ip=../HL7/FHIR-Spec",
+                "-rp=4.0.1;US-Core/3.1.1;QI-Core/4.1.1",
+                "-mn=QICore",
+                "-mv=4.1.1",
+                "-im=true",
+                "-ucp=true",
+                "-op=./output/modelinfo"
             ]
         }
     ]
diff --git a/tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/modelinfo/ig/IGClassInfoBuilder.java b/tooling/src/main/java/org/opencds/cqf/tooling/modelinfo/ig/IGClassInfoBuilder.java
similarity index 100%
rename from tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/modelinfo/ig/IGClassInfoBuilder.java
rename to tooling/src/main/java/org/opencds/cqf/tooling/modelinfo/ig/IGClassInfoBuilder.java
diff --git a/tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/modelinfo/ig/IGClassInfoSettings.java b/tooling/src/main/java/org/opencds/cqf/tooling/modelinfo/ig/IGClassInfoSettings.java
similarity index 100%
rename from tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/modelinfo/ig/IGClassInfoSettings.java
rename to tooling/src/main/java/org/opencds/cqf/tooling/modelinfo/ig/IGClassInfoSettings.java
diff --git a/tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/modelinfo/ig/IGModelInfoBuilder.java b/tooling/src/main/java/org/opencds/cqf/tooling/modelinfo/ig/IGModelInfoBuilder.java
similarity index 100%
rename from tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/modelinfo/ig/IGModelInfoBuilder.java
rename to tooling/src/main/java/org/opencds/cqf/tooling/modelinfo/ig/IGModelInfoBuilder.java
diff --git a/tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/modelinfo/ig/IGModelInfoSettings.java b/tooling/src/main/java/org/opencds/cqf/tooling/modelinfo/ig/IGModelInfoSettings.java
similarity index 100%
rename from tooling-cli/src/main/java/org/opencds/cqf/tooling/cli/modelinfo/ig/IGModelInfoSettings.java
rename to tooling/src/main/java/org/opencds/cqf/tooling/modelinfo/ig/IGModelInfoSettings.java