diff --git a/fcli-core/fcli-app/build.gradle b/fcli-core/fcli-app/build.gradle
index 0b30efc94f..fa1372fe36 100644
--- a/fcli-core/fcli-app/build.gradle
+++ b/fcli-core/fcli-app/build.gradle
@@ -5,12 +5,12 @@ apply plugin: 'com.github.johnrengelman.shadow'
 dependencies {
 	implementation project("${fcliCommonRef}")
     implementation project("${fcliConfigRef}")
-    implementation project("${fcliStateRef}")
+	implementation project("${fcliFoDRef}")
     implementation project("${fcliSSCRef}")
-    implementation project("${fcliFoDRef}")
     implementation project("${fcliSCSastRef}")
     implementation project("${fcliSCDastRef}")
     implementation project("${fcliToolRef}")
+	implementation project("${fcliLicenseRef}")
     implementation project("${fcliUtilRef}")
 
     // Logging dependencies
diff --git a/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java
index 4083ca4bdb..06d1638bf0 100644
--- a/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java
+++ b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/_main/cli/cmd/FCLIRootCommands.java
@@ -13,15 +13,15 @@
 package com.fortify.cli.app._main.cli.cmd;
 
 import com.fortify.cli.app.FortifyCLIVersionProvider;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.util.DisableTest;
 import com.fortify.cli.common.util.DisableTest.TestType;
 import com.fortify.cli.config._main.cli.cmd.ConfigCommands;
 import com.fortify.cli.fod._main.cli.cmd.FoDCommands;
+import com.fortify.cli.license._main.cli.cmd.LicenseCommands;
 import com.fortify.cli.sc_dast._main.cli.cmd.SCDastCommands;
 import com.fortify.cli.sc_sast._main.cli.cmd.SCSastCommands;
 import com.fortify.cli.ssc._main.cli.cmd.SSCCommands;
-import com.fortify.cli.state._main.cli.cmd.StateCommands;
 import com.fortify.cli.tool._main.cli.cmd.ToolCommands;
 import com.fortify.cli.util._main.cli.cmd.UtilCommands;
 
@@ -44,16 +44,16 @@
     versionProvider = FortifyCLIVersionProvider.class,
     subcommands = {
             ConfigCommands.class,
-            StateCommands.class,
             FoDCommands.class,
             SCDastCommands.class,
             SCSastCommands.class,
             SSCCommands.class,
             ToolCommands.class,
+            LicenseCommands.class,
             UtilCommands.class
     }
 )
-public class FCLIRootCommands extends AbstractFortifyCLICommand {    
+public class FCLIRootCommands extends AbstractContainerCommand {    
     // We only want to have the --version option on the top-level fcli command,
     @Option(names = {"-V", "--version"}, versionHelp = true, scope = ScopeType.LOCAL, order = -1002)
     @DisableTest(TestType.OPT_SHORT_NAME)
diff --git a/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java
index d44fd963ca..786a820d88 100644
--- a/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java
+++ b/fcli-core/fcli-app/src/main/java/com/fortify/cli/app/runner/util/FortifyCLIDynamicInitializer.java
@@ -19,9 +19,9 @@
 
 import org.slf4j.LoggerFactory;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand.GenericOptionsArgGroup;
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand.LogLevel;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand.GenericOptionsArgGroup;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand.LogLevel;
 
 import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
@@ -111,7 +111,7 @@ private CommandLine createGenericOptionsCommandLine() {
     
     @Command(name = "fcli")
     @RequiredArgsConstructor
-    public static final class FortifyCLIInitializerCommand extends AbstractFortifyCLICommand implements Runnable {
+    public static final class FortifyCLIInitializerCommand extends AbstractRunnableCommand implements Runnable {
         private final Consumer<GenericOptionsArgGroup> consumer;
         
         @Override
diff --git a/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java b/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java
index df28465b24..0871efd271 100644
--- a/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java
+++ b/fcli-core/fcli-app/src/test/java/com/fortify/cli/FortifyCLITest.java
@@ -101,7 +101,9 @@ private void checkOptions(Results results, CommandSpec cmdSpec) {
 
     private void checkStandardOptions(Results results, CommandSpec spec) {
         var optionNames = spec.optionsMap().keySet();
-        var expectedOptionNames = Arrays.asList("-h", "--help", "--log-level", "--log-file", "--env-prefix");
+        var expectedOptionNames = spec.userObject() instanceof Runnable
+                ? Arrays.asList("-h", "--help", "--log-level", "--log-file", "--env-prefix")
+                : Arrays.asList("-h", "--help");
         if ( !optionNames.containsAll(expectedOptionNames) ) {
             results.add(TestType.CMD_STD_OPTS, Level.ERROR, spec, "Missing one or more standard option names: "+expectedOptionNames);
         }
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractContainerCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractContainerCommand.java
new file mode 100644
index 0000000000..93c82df210
--- /dev/null
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractContainerCommand.java
@@ -0,0 +1,26 @@
+/*******************************************************************************
+ * Copyright 2021, 2023 Open Text.
+ *
+ * The only warranties for products and services of Open Text 
+ * and its affiliates and licensors ("Open Text") are as may 
+ * be set forth in the express warranty statements accompanying 
+ * such products and services. Nothing herein should be construed 
+ * as constituting an additional warranty. Open Text shall not be 
+ * liable for technical or editorial errors or omissions contained 
+ * herein. The information contained herein is subject to change 
+ * without notice.
+ *******************************************************************************/
+package com.fortify.cli.common.cli.cmd;
+
+import picocli.CommandLine.Option;
+
+/**
+ * This abstract class should be used as the base class for all fcli container commands.
+ * It is responsible for providing the standard help option.
+ *
+ * @author Ruud Senden
+ */
+public abstract class AbstractContainerCommand {
+    @Option(names = {"-h", "--help"}, usageHelp = true)
+    private boolean usageHelpRequested;
+}
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractRunnableCommand.java
similarity index 97%
rename from fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java
rename to fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractRunnableCommand.java
index 312de0bbe2..b581c0e6cd 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractFortifyCLICommand.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/cmd/AbstractRunnableCommand.java
@@ -25,7 +25,7 @@
 import picocli.CommandLine.Spec;
 
 /**
- * This abstract class should be used as the base class for all fcli commands.
+ * This abstract class should be used as the base class for all runnable fcli commands.
  * It is responsible for providing the following fcli features:
  * <ul>
  *  <li>Providing standard command configuration settings (default value provider, ...)</li>
@@ -36,7 +36,7 @@
  *
  * @author Ruud Senden
  */
-public class AbstractFortifyCLICommand {
+public abstract class AbstractRunnableCommand implements Runnable {
     // Have picocli inject the CommandSpec representing the current command
     @Spec private CommandSpec commandSpec;
     
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java
index 2296b7d276..7b190d1fda 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/cli/mixin/ICommandAware.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.common.cli.mixin;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
 
 import picocli.CommandLine.Model.CommandSpec;
 import picocli.CommandLine.Spec;
@@ -28,7 +28,7 @@
  * <p>Mixins usually wouldn't implement this interface directly, but instead
  * utilize {@link CommandHelperMixin} as it provides some useful utility methods
  * related to the the injected {@link CommandSpec}. Injection is handled 
- * by {@link AbstractFortifyCLICommand}.</p>
+ * by {@link AbstractRunnableCommand}.</p>
  * 
  * @author rsenden
  *
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java
index 0750a0f01d..88b5c33d60 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/cmd/AbstractOutputCommand.java
@@ -15,11 +15,11 @@
 import java.util.Arrays;
 import java.util.List;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
 import com.fortify.cli.common.output.cli.mixin.IOutputHelper;
 import com.fortify.cli.common.output.writer.ISingularSupplier;
 
-public abstract class AbstractOutputCommand extends AbstractFortifyCLICommand implements Runnable, ISingularSupplier {
+public abstract class AbstractOutputCommand extends AbstractRunnableCommand implements Runnable, ISingularSupplier {
     private static final List<Class<?>> supportedInterfaces = Arrays.asList(
             IBaseRequestSupplier.class, 
             IJsonNodeSupplier.class);
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java
index 7044812531..b6d74cc4ff 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/output/cli/mixin/OutputHelperMixins.java
@@ -1,13 +1,13 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
 package com.fortify.cli.common.output.cli.mixin;
@@ -21,21 +21,21 @@
 
 /**
  * <p>This class provides standard {@link IOutputHelper} implementations. Individual
- * product modules may provide additional {@link IOutputHelper} implementations as 
+ * product modules may provide additional {@link IOutputHelper} implementations as
  * needed, extending from one of these classes as appropriate:</p>
  * <ul>
  * <li>{@link Other}, not providing any standard output format or output writer factory; subclass should provide {@code CMD_NAME} constant, and outputWriterFactory and basicOutputConfig fields with Getter annotations</li>
  * <li>{@link TableWithQuery}, providing query options and default table output format; subclass should provide {@code CMD_NAME} constant</li>
  * <li>{@link TableNoQuery}, providing no query options and default table output format; subclass should provide {@code CMD_NAME} constant</li>
  * </ul>
- * 
+ *
  * <p>All standard output helper mixins defined in this class are based on {@code TableNoQuery}, except
  * for the {@code List} class which is based on {@code TableWithQuery}.</p>
- * 
+ *
  * Every command implementation should use the appropriate {@link IOutputHelper}
  * (where {@code CMD_NAME} matches the command name), either from the standard implementations
  * provided in this class, or from the product-specific implementations. Example:</p>
- * 
+ *
  * <pre>
  * &#64;ReflectiveAccess
  * &#64;Command(name = OutputHelperMixins.List.CMD_NAME)
@@ -44,172 +44,173 @@
  *     ...
  * }
  * </pre>
- * 
+ *
  * <p>Here, {@code AbstractMyProductOutputCommand} would extend from {@link AbstractOutputCommand},
  * which takes care of displaying the output generated by the command, based on the configured
  * {@link IOutputHelper} {@link Mixin}.</p>
- * 
+ *
  * @author rsenden
  */
 public class OutputHelperMixins {
     public static class Other extends AbstractOutputHelperMixin {}
-    
-    
+
+
     public static class TableWithQuery extends Other {
         @Getter @Mixin private OutputWriterWithQueryFactoryMixin outputWriterFactory;
-        @Getter private StandardOutputConfig basicOutputConfig = StandardOutputConfig.table(); 
+        @Getter private StandardOutputConfig basicOutputConfig = StandardOutputConfig.table();
     }
-    
-    
+
+
     public static class TableNoQuery extends Other {
         @Getter @Mixin private StandardOutputWriterFactoryMixin outputWriterFactory;
-        @Getter private StandardOutputConfig basicOutputConfig = StandardOutputConfig.table(); 
+        @Getter private StandardOutputConfig basicOutputConfig = StandardOutputConfig.table();
     }
-    
+
     public static class DetailsNoQuery extends Other {
         @Getter @Mixin private StandardOutputWriterFactoryMixin outputWriterFactory;
-        @Getter private StandardOutputConfig basicOutputConfig = StandardOutputConfig.details(); 
+        @Getter private StandardOutputConfig basicOutputConfig = StandardOutputConfig.details();
     }
-    
+
     public static class DetailsWithQuery extends Other {
         @Getter @Mixin private OutputWriterWithQueryFactoryMixin outputWriterFactory;
-        @Getter private StandardOutputConfig basicOutputConfig = StandardOutputConfig.details(); 
+        @Getter private StandardOutputConfig basicOutputConfig = StandardOutputConfig.details();
     }
-    
-    
+
+
     public static class Add extends TableNoQuery {
         public static final String CMD_NAME = "add";
     }
-    
-    
+
+
     public static class Create extends TableNoQuery {
         public static final String CMD_NAME = "create";
     }
-    
+
      @Command(aliases = {"rm"})
     public static class Delete extends TableNoQuery {
         public static final String CMD_NAME = "delete";
     }
-    
+
     public static class Clear extends TableNoQuery {
         public static final String CMD_NAME = "clear";
     }
-    
+
     public static class Revoke extends TableNoQuery {
         public static final String CMD_NAME = "revoke";
     }
-    
+
     @Command(name = "list", aliases = {"ls"})
     public static class List extends TableWithQuery {
         public static final String CMD_NAME = "list";
     }
-    
-    
+
+
     public static class Get extends DetailsNoQuery {
         public static final String CMD_NAME = "get";
     }
-    
+
     public static class Generate extends DetailsNoQuery {
         public static final String CMD_NAME = "generate";
     }
-    
+
     public static class GenerateConfig extends TableNoQuery {
         public static final String CMD_NAME = "generate-config";
     }
-    
+
     public static class Status extends TableNoQuery {
         public static final String CMD_NAME = "status";
     }
-    
-    
+
+
     public static class Set extends TableNoQuery {
         public static final String CMD_NAME = "set";
    }
-    
-    
+
+
     public static class Update extends TableNoQuery {
         public static final String CMD_NAME = "update";
     }
-    
-    
+
+
     public static class Enable extends TableNoQuery {
         public static final String CMD_NAME = "enable";
     }
-    
-    
+
+
     public static class Disable extends TableNoQuery {
         public static final String CMD_NAME = "disable";
     }
-    
-    
+
+
     public static class Start extends TableNoQuery {
         public static final String CMD_NAME = "start";
     }
-    
-    
+
+
     public static class Pause extends TableNoQuery {
         public static final String CMD_NAME = "pause";
     }
-    
-    
+
+
     public static class Resume extends TableNoQuery {
         public static final String CMD_NAME = "resume";
     }
-    
-    
+
+
     public static class Cancel extends TableNoQuery {
         public static final String CMD_NAME = "cancel";
     }
 
-    
+
     public static class Upload extends TableNoQuery {
         public static final String CMD_NAME = "upload";
     }
-    
-    
+
+
     public static class Download extends TableNoQuery {
         public static final String CMD_NAME = "download";
     }
-    
-    
+
+
     public static class Install extends TableNoQuery {
         public static final String CMD_NAME = "install";
     }
-    
-    
+
+
     public static class Uninstall extends TableNoQuery {
         public static final String CMD_NAME = "uninstall";
     }
 
-    
+
     public static class Import extends TableNoQuery {
         public static final String CMD_NAME = "import";
     }
 
-    
+
     public static class Export extends TableNoQuery {
         public static final String CMD_NAME = "export";
     }
 
-    
+
     public static class Setup extends TableNoQuery {
         public static final String CMD_NAME = "setup";
     }
-    
+
     public static class WaitFor extends TableNoQuery {
         public static final String CMD_NAME = "wait-for";
     }
-    
+
     public static class Login extends TableNoQuery {
         public static final String CMD_NAME = "login";
     }
-    
-    
+
+
     public static class Logout extends TableNoQuery {
         public static final String CMD_NAME = "logout";
     }
-    
+
     public static class RestCall extends DetailsWithQuery {
         public static final String CMD_NAME = "call";
     }
+
 }
diff --git a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java
index 7f592ec321..d5abbd9cad 100644
--- a/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java
+++ b/fcli-core/fcli-common/src/main/java/com/fortify/cli/common/rest/cli/cmd/AbstractWaitForCommand.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.common.rest.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
 import com.fortify.cli.common.output.product.IProductHelperSupplier;
 import com.fortify.cli.common.output.transform.IActionCommandResultSupplier;
@@ -28,7 +28,7 @@
 import lombok.Getter;
 import picocli.CommandLine.Mixin;
 
-public abstract class AbstractWaitForCommand extends AbstractFortifyCLICommand implements IActionCommandResultSupplier, IProductHelperSupplier, ISingularSupplier, Runnable {
+public abstract class AbstractWaitForCommand extends AbstractRunnableCommand implements IActionCommandResultSupplier, IProductHelperSupplier, ISingularSupplier, Runnable {
     @Getter @Mixin private OutputHelperMixins.WaitFor outputHelper;
     @Mixin private WaitHelperControlOptions controlOptions;
     @Mixin private WaitHelperWaitOptions waitOptions;
diff --git a/fcli-core/fcli-common/src/main/java/picocli/AutoComplete.java b/fcli-core/fcli-common/src/main/java/picocli/AutoComplete.java
index 64222bb675..05d4149736 100644
--- a/fcli-core/fcli-common/src/main/java/picocli/AutoComplete.java
+++ b/fcli-core/fcli-common/src/main/java/picocli/AutoComplete.java
@@ -663,6 +663,7 @@ private static String generateFunctionForCommand(String functionName, String com
                 "  local curr_word=${COMP_WORDS[COMP_CWORD]}\n" +
                 "%s" +
                 "\n" +
+                "  local extraCompGenOpts=()" + // PATCH for #2068: Add extraCompGenOpts array
                 "  local commands=\"%s\"\n" +  // local commands="gettingstarted tool"
                 "  local flag_opts=\"%s\"\n" + // local flag_opts="--verbose -V -x --extract -t --list"
                 "  local arg_opts=\"%s\"\n";   // local arg_opts="--host --option --file -f -u --timeUnit"
@@ -674,7 +675,8 @@ private static String generateFunctionForCommand(String functionName, String com
                 "    local positionals=\"\"\n" +
                 "%s" +
                 "    local IFS=$'\\n'\n" +
-                "    COMPREPLY=( $(compgen -W \"${commands// /$'\\n'}${IFS}${positionals}\" -- \"${curr_word}\") )\n" +
+                // PATCH for #2068: Add extraCompGenOpts reference to compgen invocation
+                "    COMPREPLY=( $(compgen ${extraCompGenOpts[@]} -W \"${commands// /$'\\n'}${IFS}${positionals}\" -- \"${curr_word}\") )\n" +
                 "  fi\n" +
                 "}\n";
 
@@ -785,6 +787,8 @@ private static String generatePositionalParamsCases(List<PositionalParamSpec> po
                 buff.append(format("%s      positionals=$( compReplyArray \"${%s_pos_param_args[@]}\" )\n", indent, paramName, currWord));
             } else if (type.equals(File.class) || "java.nio.file.Path".equals(type.getName())) {
                 buff.append(format("%s    %s (( currIndex >= %d && currIndex <= %d )); then\n", indent, ifOrElif, min, max));
+                // PATCH for #2068: Add '-f' option to extraCompGenOpts
+                buff.append(format("%s      extraCompGenOpts+=('-f')\n", indent));
                 buff.append(format("%s      local IFS=$'\\n'\n", indent));
                 buff.append(format("%s      type compopt &>/dev/null && compopt -o filenames\n", indent)); // #1464 workaround for old bash
                 buff.append(format("%s      positionals=$( compgen -f -- \"%s\" ) # files\n", indent, currWord));
diff --git a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java
index 53e20fab91..2fec04a295 100644
--- a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java
+++ b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/_main/cli/cmd/ConfigCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.config._main.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.config.language.cli.cmd.LanguageCommands;
 import com.fortify.cli.config.proxy.cli.cmd.ProxyCommands;
 import com.fortify.cli.config.truststore.cli.cmd.TrustStoreCommands;
@@ -30,5 +30,5 @@
                 TrustStoreCommands.class
         }
 )
-public class ConfigCommands extends AbstractFortifyCLICommand {
+public class ConfigCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java
index ca557a4ef5..d0a931cded 100644
--- a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java
+++ b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/language/cli/cmd/LanguageCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.config.language.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine;
 
@@ -27,5 +27,5 @@
                 LanguageGetCommand.class
         }
 )
-public class LanguageCommands extends AbstractFortifyCLICommand {
+public class LanguageCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java
index 9f5301cda0..4b8ce92915 100644
--- a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java
+++ b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/proxy/cli/cmd/ProxyCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.config.proxy.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -26,5 +26,5 @@
             ProxyUpdateCommand.class
         }
 )
-public class ProxyCommands extends AbstractFortifyCLICommand {
+public class ProxyCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java
index 1006d19433..c67fded932 100644
--- a/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java
+++ b/fcli-core/fcli-config/src/main/java/com/fortify/cli/config/truststore/cli/cmd/TrustStoreCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.config.truststore.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -24,5 +24,5 @@
             TrustStoreSetCommand.class,
         }
 )
-public class TrustStoreCommands extends AbstractFortifyCLICommand {
+public class TrustStoreCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties b/fcli-core/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties
index d4254aa72a..d3da598512 100644
--- a/fcli-core/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties
+++ b/fcli-core/fcli-config/src/main/resources/com/fortify/cli/config/i18n/ConfigMessages.properties
@@ -10,7 +10,7 @@ fcli.config.usage.description = The commands in this module allow for managing c
 
 # fcli config clear
 fcli.config.clear.usage.header = Clear full fcli configuration.
-fcli.config.clear.usage.description = This command deletes the fcli configuration directory, clearing configuration settings like language, proxy and trust store settings. Note that this does not clear current fcli state, like session and variable data; please use the 'fcli state clear' command for clearing state data.
+fcli.config.clear.usage.description = This command deletes the fcli configuration directory, clearing configuration settings like language, proxy and trust store settings. Note that this does not clear current fcli state, like session and variable data; please use the 'fcli util state clear' command for clearing state data.
 fcli.config.clear.confirm = Confirm deleting all fcli configuration settings.
 
 # fcli config language
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java
index 42f6521c97..8cc1183c3d 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/output/mixin/FoDOutputHelperMixins.java
@@ -1,13 +1,13 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
 package com.fortify.cli.fod._common.output.mixin;
@@ -84,4 +84,8 @@ public static class ImportMobile extends OutputHelperMixins.TableNoQuery {
         public static final String CMD_NAME = "import-mobile";
     }
 
+    public static class Lookup extends OutputHelperMixins.TableWithQuery {
+        public static final String CMD_NAME = "lookup";
+    }
+
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java
index 986453ebc9..28f3a5ba71 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_common/session/cli/cmd/FoDSessionCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.fod._common.session.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -24,5 +24,5 @@
                 FoDSessionLogoutCommand.class 
         }
 )
-public class FoDSessionCommands extends AbstractFortifyCLICommand {
+public class FoDSessionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java
index 24e487b566..ae7066ee94 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/_main/cli/cmd/FoDCommands.java
@@ -1,21 +1,20 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
 package com.fortify.cli.fod._main.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.fod._common.session.cli.cmd.FoDSessionCommands;
 import com.fortify.cli.fod.app.cli.cmd.FoDAppCommands;
-import com.fortify.cli.fod.lookup.cli.cmd.FoDLookupCommands;
 import com.fortify.cli.fod.microservice.cli.cmd.FoDAppMicroserviceCommands;
 import com.fortify.cli.fod.release.cli.cmd.FoDAppRelCommands;
 import com.fortify.cli.fod.rest.cli.cmd.FoDRestCommands;
@@ -32,22 +31,21 @@
         subcommands = {
                 // This list of product subcommands should be in alphabetical
                 // order, except for:
-                // - session command (should be the first command, as it is a 
+                // - session command (should be the first command, as it is a
                 //   prerequisite for all other commands)
                 // - rest command (should be the last command, as it's a low-level
-                //   command and looks better in the usage command list, as usually 
-                //   'rest' has a different header ('Interact with' compared to most 
+                //   command and looks better in the usage command list, as usually
+                //   'rest' has a different header ('Interact with' compared to most
                 //   other commands ('Manage').
                 FoDSessionCommands.class,
                 FoDAppCommands.class,
                 FoDAppRelCommands.class,
                 FoDAppMicroserviceCommands.class,
-                FoDLookupCommands.class,
                 FoDScanCommands.class,
                 FoDUserCommands.class,
                 FoDUserGroupCommands.class,
                 FoDRestCommands.class,
-                
+
         }
 )
-public class FoDCommands extends AbstractFortifyCLICommand {}
+public class FoDCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java
index 315c35d412..dbaaf9cf3d 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/app/cli/cmd/FoDAppCommands.java
@@ -1,24 +1,23 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
 package com.fortify.cli.fod.app.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "app",
-        aliases = {"application"},
         subcommands = {
                 FoDAppCreateWebAppCommand.class,
                 FoDAppCreateMicroserviceAppCommand.class,
@@ -30,5 +29,5 @@
         }
 )
 @DefaultVariablePropertyName("applicationId")
-public class FoDAppCommands extends AbstractFortifyCLICommand {
+public class FoDAppCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupCommands.java
deleted file mode 100644
index 7bdff6dc2b..0000000000
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupCommands.java
+++ /dev/null
@@ -1,35 +0,0 @@
-/*******************************************************************************
- * Copyright 2021, 2023 Open Text.
- *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
- * without notice.
- *******************************************************************************/
-
-package com.fortify.cli.fod.lookup.cli.cmd;
-
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
-import com.fortify.cli.common.variable.DefaultVariablePropertyName;
-
-import picocli.CommandLine;
-
-// TODO 'lookup' isn't really an entity, potentially 'lookup-items' could be considered 
-//      an FoD entity, so lookup-items should be the command name, and 'lookup' an alias
-//      to allow for less typing.
-// TODO Any way to refactor this into more 'concrete' entity commands? Given the number of 
-//      possible lookup types, we can't define separate entities for each lookup type, but
-//      may we can think of a different approach?
-@CommandLine.Command(name = "lookup",
-        aliases = {"lookup-items"},
-        subcommands = {
-                FoDLookupListCommand.class
-        }
-)
-@DefaultVariablePropertyName("text")
-public class FoDLookupCommands extends AbstractFortifyCLICommand {
-}
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java
index 4c86b0ff34..f28eb0775a 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/microservice/cli/cmd/FoDAppMicroserviceCommands.java
@@ -1,25 +1,24 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
 
 package com.fortify.cli.fod.microservice.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "microservice",
-        aliases = {"app-ms"},
         subcommands = {
                 FoDAppMicroserviceCreateCommand.class,
                 FoDAppMicroserviceListCommand.class,
@@ -29,5 +28,5 @@
         }
 )
 @DefaultVariablePropertyName("microserviceId")
-public class FoDAppMicroserviceCommands extends AbstractFortifyCLICommand {
+public class FoDAppMicroserviceCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java
index 726c334f66..56c5cbbd9e 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/release/cli/cmd/FoDAppRelCommands.java
@@ -1,25 +1,24 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
 
 package com.fortify.cli.fod.release.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine;
 
 @CommandLine.Command(name = "release",
-        aliases = {"app-rel"},
         subcommands = {
                 FoDAppRelCreateCommand.class,
                 FoDAppRelListCommand.class,
@@ -29,5 +28,5 @@
         }
 )
 @DefaultVariablePropertyName("releaseId")
-public class FoDAppRelCommands extends AbstractFortifyCLICommand {
+public class FoDAppRelCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java
index 20a28f4ccc..000d955f33 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/cli/cmd/FoDRestCommands.java
@@ -1,18 +1,19 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
 package com.fortify.cli.fod.rest.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
+import com.fortify.cli.fod.rest.lookup.cli.cmd.FoDLookupCommand;
 
 import picocli.CommandLine.Command;
 
@@ -20,9 +21,10 @@
         name = "rest",
         aliases = {},
         subcommands = {
-                FoDRestCallCommand.class
+                FoDRestCallCommand.class,
+                FoDLookupCommand.class
         }
 
 )
-public class FoDRestCommands extends AbstractFortifyCLICommand {
+public class FoDRestCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/cli/cmd/FoDLookupCommand.java
similarity index 72%
rename from fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java
rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/cli/cmd/FoDLookupCommand.java
index 94adf5818c..c8a3102c21 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/cmd/FoDLookupListCommand.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/cli/cmd/FoDLookupCommand.java
@@ -1,38 +1,37 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.fod.lookup.cli.cmd;
+package com.fortify.cli.fod.rest.lookup.cli.cmd;
 
 import com.fasterxml.jackson.databind.JsonNode;
-import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
 import com.fortify.cli.common.output.transform.IRecordTransformer;
 import com.fortify.cli.common.rest.query.IServerSideQueryParamGeneratorSupplier;
 import com.fortify.cli.common.rest.query.IServerSideQueryParamValueGenerator;
 import com.fortify.cli.fod._common.output.cli.AbstractFoDBaseRequestOutputCommand;
+import com.fortify.cli.fod._common.output.mixin.FoDOutputHelperMixins;
 import com.fortify.cli.fod._common.rest.FoDUrls;
 import com.fortify.cli.fod._common.rest.query.FoDFiltersParamGenerator;
 import com.fortify.cli.fod._common.rest.query.cli.mixin.FoDFiltersParamMixin;
-import com.fortify.cli.fod.lookup.cli.mixin.FoDLookupTypeOptions;
-import com.fortify.cli.fod.lookup.helper.FoDLookupHelper;
-
+import com.fortify.cli.fod.rest.lookup.cli.mixin.FoDLookupTypeOptions;
+import com.fortify.cli.fod.rest.lookup.helper.FoDLookupHelper;
 import kong.unirest.HttpRequest;
 import kong.unirest.UnirestInstance;
 import lombok.Getter;
 import picocli.CommandLine.Command;
 import picocli.CommandLine.Mixin;
 
-@Command(name = OutputHelperMixins.List.CMD_NAME)
-public class FoDLookupListCommand extends AbstractFoDBaseRequestOutputCommand implements IRecordTransformer, IServerSideQueryParamGeneratorSupplier {
-    @Getter @Mixin private OutputHelperMixins.List outputHelper;
+@Command(name = FoDOutputHelperMixins.Lookup.CMD_NAME)
+public class FoDLookupCommand extends AbstractFoDBaseRequestOutputCommand implements IRecordTransformer, IServerSideQueryParamGeneratorSupplier {
+    @Getter @Mixin private FoDOutputHelperMixins.Lookup outputHelper;
 
     @Mixin private FoDLookupTypeOptions.OptionalLookupOption lookupType;
     @Mixin private FoDFiltersParamMixin filterParamMixin;
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/mixin/FoDLookupTypeOptions.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/cli/mixin/FoDLookupTypeOptions.java
similarity index 92%
rename from fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/mixin/FoDLookupTypeOptions.java
rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/cli/mixin/FoDLookupTypeOptions.java
index 903cc3d38b..f4f6fb8079 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/cli/mixin/FoDLookupTypeOptions.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/cli/mixin/FoDLookupTypeOptions.java
@@ -1,16 +1,16 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.fod.lookup.cli.mixin;
+package com.fortify.cli.fod.rest.lookup.cli.mixin;
 
 import java.util.ArrayList;
 import java.util.stream.Collectors;
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupDescriptor.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/helper/FoDLookupDescriptor.java
similarity index 78%
rename from fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupDescriptor.java
rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/helper/FoDLookupDescriptor.java
index 9219acdaf0..c7ab132215 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupDescriptor.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/helper/FoDLookupDescriptor.java
@@ -1,16 +1,16 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.fod.lookup.helper;
+package com.fortify.cli.fod.rest.lookup.helper;
 
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonNodeHolder;
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/helper/FoDLookupHelper.java
similarity index 73%
rename from fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupHelper.java
rename to fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/helper/FoDLookupHelper.java
index 440c693617..3205ef2b16 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/lookup/helper/FoDLookupHelper.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/rest/lookup/helper/FoDLookupHelper.java
@@ -1,21 +1,16 @@
 /*******************************************************************************
  * Copyright 2021, 2023 Open Text.
  *
- * The only warranties for products and services of Open Text 
- * and its affiliates and licensors ("Open Text") are as may 
- * be set forth in the express warranty statements accompanying 
- * such products and services. Nothing herein should be construed 
- * as constituting an additional warranty. Open Text shall not be 
- * liable for technical or editorial errors or omissions contained 
- * herein. The information contained herein is subject to change 
+ * The only warranties for products and services of Open Text
+ * and its affiliates and licensors ("Open Text") are as may
+ * be set forth in the express warranty statements accompanying
+ * such products and services. Nothing herein should be construed
+ * as constituting an additional warranty. Open Text shall not be
+ * liable for technical or editorial errors or omissions contained
+ * herein. The information contained herein is subject to change
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.fod.lookup.helper;
-
-import java.util.Iterator;
-import java.util.List;
-
-import javax.validation.ValidationException;
+package com.fortify.cli.fod.rest.lookup.helper;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
@@ -24,25 +19,26 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.output.transform.fields.RenameFieldsTransformer;
 import com.fortify.cli.fod._common.rest.FoDUrls;
-import com.fortify.cli.fod.lookup.cli.mixin.FoDLookupTypeOptions.FoDLookupType;
-
+import com.fortify.cli.fod.rest.lookup.cli.mixin.FoDLookupTypeOptions;
 import kong.unirest.GetRequest;
 import kong.unirest.UnirestInstance;
 import lombok.Getter;
 
-// TODO As a best practice, if-blocks should be enclosed in curly braces
-// TODO Looks like these methods are never expected to return null, so consider
-//      refactoring such that 'return null' at the end is not needed
+import javax.validation.ValidationException;
+import java.util.Iterator;
+import java.util.List;
+
 public class FoDLookupHelper {
     @Getter
     private static final ObjectMapper objectMapper = new ObjectMapper();
 
-
     public static final JsonNode renameFields(JsonNode record) {
         return new RenameFieldsTransformer(new String[]{}).transform(record);
     }
 
-    public static final FoDLookupDescriptor getDescriptor(UnirestInstance unirestInstance, FoDLookupType type, String text, boolean failIfNotFound) throws JsonProcessingException {
+    public static final FoDLookupDescriptor getDescriptor(UnirestInstance unirestInstance, FoDLookupTypeOptions.FoDLookupType type,
+                                                          String text, boolean failIfNotFound) throws JsonProcessingException {
+        FoDLookupDescriptor currentLookup = null;
         GetRequest request = unirestInstance.get(FoDUrls.LOOKUP_ITEMS).queryString("type",
                 type.name());
         JsonNode items = request.asObject(ObjectNode.class).getBody().get("items");
@@ -51,16 +47,20 @@ public static final FoDLookupDescriptor getDescriptor(UnirestInstance unirestIns
                 });
         Iterator<FoDLookupDescriptor> lookupIterator = lookupList.iterator();
         while (lookupIterator.hasNext()) {
-            FoDLookupDescriptor currentLookup = lookupIterator.next();
-            if (currentLookup.getText().equals(text)) return currentLookup;
+            currentLookup = lookupIterator.next();
+            if (currentLookup.getText().equals(text)) {
+                break;
+            }
         }
-        if (failIfNotFound)
+        if (failIfNotFound) {
             throw new ValidationException("No value found for '" + text + "' in " + type.name());
-        return null;
+        }
+        return currentLookup;
     }
 
-    public static final FoDLookupDescriptor getDescriptor(UnirestInstance unirestInstance, FoDLookupType type,
+    public static final FoDLookupDescriptor getDescriptor(UnirestInstance unirestInstance, FoDLookupTypeOptions.FoDLookupType type,
                                                           String group, String text, boolean failIfNotFound) throws JsonProcessingException {
+        FoDLookupDescriptor currentLookup = null;
         GetRequest request = unirestInstance.get(FoDUrls.LOOKUP_ITEMS).queryString("type",
                 type.name());
         JsonNode items = request.asObject(ObjectNode.class).getBody().get("items");
@@ -69,11 +69,14 @@ public static final FoDLookupDescriptor getDescriptor(UnirestInstance unirestIns
                 });
         Iterator<FoDLookupDescriptor> lookupIterator = lookupList.iterator();
         while (lookupIterator.hasNext()) {
-            FoDLookupDescriptor currentLookup = lookupIterator.next();
-            if (currentLookup.getGroup().equals(group) && currentLookup.getText().equals(text)) return currentLookup;
+            currentLookup = lookupIterator.next();
+            if (currentLookup.getGroup().equals(group) && currentLookup.getText().equals(text)) {
+                break;
+            }
         }
-        if (failIfNotFound)
+        if (failIfNotFound) {
             throw new ValidationException("No value found for '" + text + "' with group '" + group + "' in " + type.name());
-        return null;
+        }
+        return currentLookup;
     }
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java
index 18261ccb6d..fcf96d4128 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/FoDScanCommands.java
@@ -13,7 +13,7 @@
 
 package com.fortify.cli.fod.scan.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 import com.fortify.cli.fod.scan.cli.cmd.dast.FoDDastScanImportCommand;
 import com.fortify.cli.fod.scan.cli.cmd.dast.FoDDastScanStartCommand;
@@ -48,5 +48,5 @@
         }
 )
 @DefaultVariablePropertyName("scanId")
-public class FoDScanCommands extends AbstractFortifyCLICommand {
+public class FoDScanCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java
index 712c2c7beb..83718b1b9d 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/mobile/FoDMobileScanStartCommand.java
@@ -31,9 +31,9 @@
 import com.fortify.cli.fod._common.output.mixin.FoDOutputHelperMixins;
 import com.fortify.cli.fod._common.util.FoDConstants;
 import com.fortify.cli.fod._common.util.FoDEnums;
-import com.fortify.cli.fod.lookup.cli.mixin.FoDLookupTypeOptions;
-import com.fortify.cli.fod.lookup.helper.FoDLookupDescriptor;
-import com.fortify.cli.fod.lookup.helper.FoDLookupHelper;
+import com.fortify.cli.fod.rest.lookup.cli.mixin.FoDLookupTypeOptions;
+import com.fortify.cli.fod.rest.lookup.helper.FoDLookupDescriptor;
+import com.fortify.cli.fod.rest.lookup.helper.FoDLookupHelper;
 import com.fortify.cli.fod.release.cli.mixin.FoDAppMicroserviceRelResolverMixin;
 import com.fortify.cli.fod.scan.cli.mixin.FoDAssessmentTypeOptions;
 import com.fortify.cli.fod.scan.cli.mixin.FoDEntitlementFrequencyTypeOptions;
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java
index f697c0b9c1..042a96f2ba 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/cli/cmd/sast/FoDSastScanSetupCommand.java
@@ -23,9 +23,9 @@
 import com.fortify.cli.fod._common.output.cli.AbstractFoDJsonNodeOutputCommand;
 import com.fortify.cli.fod._common.output.mixin.FoDOutputHelperMixins;
 import com.fortify.cli.fod._common.util.FoDEnums;
-import com.fortify.cli.fod.lookup.cli.mixin.FoDLookupTypeOptions;
-import com.fortify.cli.fod.lookup.helper.FoDLookupDescriptor;
-import com.fortify.cli.fod.lookup.helper.FoDLookupHelper;
+import com.fortify.cli.fod.rest.lookup.cli.mixin.FoDLookupTypeOptions;
+import com.fortify.cli.fod.rest.lookup.helper.FoDLookupDescriptor;
+import com.fortify.cli.fod.rest.lookup.helper.FoDLookupHelper;
 import com.fortify.cli.fod.release.cli.mixin.FoDAppMicroserviceRelResolverMixin;
 import com.fortify.cli.fod.release.helper.FoDAppRelAssessmentTypeDescriptor;
 import com.fortify.cli.fod.release.helper.FoDAppRelHelper;
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java
index 0fd56574b9..5b498ea022 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/scan/helper/dast/FoDSetupDastScanRequest.java
@@ -81,6 +81,7 @@ public BlackoutHour(Integer hour, Boolean checked) {
     Boolean multiFactorAuth = false;
     String multiFactorAuthText;
     String notes;
+    @Builder.Default
     Boolean requestCall = false;
     // DEPRECATED
     // Boolean whitelistRequired;
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java
index 80bc6f9cf2..8441d26b46 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/cli/cmd/FoDUserCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.fod.user.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine;
@@ -27,5 +27,5 @@
         }
 )
 @DefaultVariablePropertyName("userId")
-public class FoDUserCommands extends AbstractFortifyCLICommand {
+public class FoDUserCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java
index abcbc1d7e0..7e1b7b7325 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user/helper/FoDUserHelper.java
@@ -28,9 +28,9 @@
 import com.fortify.cli.fod._common.util.FoDEnums;
 import com.fortify.cli.fod.app.helper.FoDAppDescriptor;
 import com.fortify.cli.fod.app.helper.FoDAppHelper;
-import com.fortify.cli.fod.lookup.cli.mixin.FoDLookupTypeOptions;
-import com.fortify.cli.fod.lookup.helper.FoDLookupDescriptor;
-import com.fortify.cli.fod.lookup.helper.FoDLookupHelper;
+import com.fortify.cli.fod.rest.lookup.cli.mixin.FoDLookupTypeOptions;
+import com.fortify.cli.fod.rest.lookup.helper.FoDLookupDescriptor;
+import com.fortify.cli.fod.rest.lookup.helper.FoDLookupHelper;
 import com.fortify.cli.fod.user_group.helper.FoDUserGroupHelper;
 
 import kong.unirest.GetRequest;
diff --git a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java
index a4396d0f22..a4e2618f68 100644
--- a/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java
+++ b/fcli-core/fcli-fod/src/main/java/com/fortify/cli/fod/user_group/cli/cmd/FoDUserGroupCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.fod.user_group.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine;
@@ -27,5 +27,5 @@
         }
 )
 @DefaultVariablePropertyName("id")
-public class FoDUserGroupCommands extends AbstractFortifyCLICommand {
+public class FoDUserGroupCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties
index 68b2e97249..9454dd082b 100644
--- a/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties
+++ b/fcli-core/fcli-fod/src/main/resources/com/fortify/cli/fod/i18n/FoDMessages.properties
@@ -4,8 +4,8 @@ product=FoD
 # Make sure none of the commands inherit usage header or description of the top-level fcli command
 # Note that we define these as usage.* whereas our parent bundle defines fcli.usage.* (with fcli prefix).
 # For some reason, overriding fcli.usage.* doesn't work.
-usage.header = 
-usage.description = 
+usage.header =
+usage.description =
 
 ### top level product command ###
 delim = Change the default delimiter character when using options that accept \
@@ -105,7 +105,7 @@ fcli.fod.rest.usage.header = Interact with FoD REST API endpoints.
 fcli.fod.rest.usage.description = These commands allow for direct interaction with FoD REST API endpoints, \
   somewhat similar to using 'curl' but benefiting from standard fcli functionality like session management \
   (no need to manually specify Authorization header), rich output formatting options, and query functionality.
-fcli.fod.rest.call.usage.header = Call an individual Fortify FoD REST API endpoint.
+fcli.fod.rest.call.usage.header = Call an individual FoD REST API endpoint.
 fcli.fod.rest.call.no-paging = By default, this command will load all pages of data from FoD (from the \
   given offset if specified as a request parameter). Use this option to return only a single page. 
 fcli.fod.rest.call.no-transform = By default, this command performs generic transformations on FoD REST \
@@ -116,14 +116,20 @@ fcli.fod.rest.call.transform = This option allows for performing custom transfor
   data from sub-properties, or using project selection/projection. Note that the expression operates on \
   the raw response, as if --no-transform was specified before evaluating the expression.
 
+fcli.fod.rest.lookup.usage.header = Retrieve FoD REST API lookup values.
+fcli.fod.rest.lookup.usage.description = Use this command to retrieve the values of lookup items (types) \
+  that are used with various commands and when using the FoD REST API directly.
+fcli.fod.rest.lookup.type = The type of lookup items to return. Valid values: ${COMPLETION-CANDIDATES}. \
+  Leave empty to list all the valid lookup items of the REST API. 
 
 ### For the "fod app" command ###
 fcli.fod.app.usage.header = Manage FoD applications.
 
 # For the "fod app create-web-app" command
-fcli.fod.app.create-web-app.usage.header = Create a new web application (with a release). \
+fcli.fod.app.create-web-app.usage.header = Create a new web application.
+fcli.fod.app.create-web-app.usage.description = This command allows a new web application and its first release. \
   Please note some attributes might be mandatory depending on the configuration of your tenant. Please check the \
-  Fortify on Demand web portal first.
+  Fortify on Demand web portal first. 
 fcli.fod.app.create-web-app.application-name = The name of the application to create.
 fcli.fod.app.create-web-app.release-name = The name of the release to create for the application.
 fcli.fod.app.create-web-app.description = Description of the application.
@@ -138,7 +144,8 @@ fcli.fod.app.create-web-app.skip-if-exists = Check to see if application already
 fcli.fod.app.create-web-app.auto-required-attrs = Automatically set a default value for required attributes.
 
 # For the "fod app create-mobile-app" command
-fcli.fod.app.create-mobile-app.usage.header = Create a new mobile application (with a release). \
+fcli.fod.app.create-mobile-app.usage.header = Create a new mobile application.
+fcli.fod.app.create-mobile-app.usage.description = Create a new mobile application and its first release. \
   Please note some attributes might be mandatory depending on the configuration of your tenant. Please check the \
   Fortify on Demand web portal first.
 fcli.fod.app.create-mobile-app.application-name = ${fcli.fod.app.create-web-app.application-name}
@@ -155,7 +162,8 @@ fcli.fod.app.create-mobile-app.skip-if-exists = ${fcli.fod.app.create-web-app.sk
 fcli.fod.app.create-mobile-app.auto-required-attrs = ${fcli.fod.app.create-web-app.auto-required-attrs}
 
 # For the "fod app create-microservice-app" command
-fcli.fod.app.create-microservice-app.usage.header = Create a new microservice application (with a release). \
+fcli.fod.app.create-microservice-app.usage.header = Create a new microservice application.
+fcli.fod.app.create-microservice-app.usage.description = Create a new microservice application and its first release. \
   Please note some attributes might be mandatory depending on the configuration of your tenant. Please check the \
   Fortify on Demand web portal first.
 fcli.fod.app.create-microservice-app.missing-microservice = Missing option: if 'Microservice' type is specified then one or more 'microservice' options need to be specified.
@@ -187,9 +195,10 @@ fcli.fod.app.get.usage.header = Get application details.
 fcli.fod.app.get.app = The id or name of the application to get.
 
 # For the "fod app update" command
-fcli.fod.app.update.usage.header = Update an existing application. \
-  To create, update or delete any releases on the application use the 'fcli fod app-rel' subcommands. \
-  To create, update or delete any microservices on the application use the 'fcli fod app-ms' subcommands. \
+fcli.fod.app.update.usage.header = Update an existing application.
+fcli.fod.app.update.usage.description = This command updates the details of an application. \
+  To create, update or delete any releases on the application use the 'fcli fod release' subcommands. \
+  To create, update or delete any microservices on the application use the 'fcli fod microservice' subcommands. \
   To update user and group access for the application use the 'fcli fod user' and 'fcli fod user-group' subcommands.
 fcli.fod.app.update.app = The id or name of the application to update.
 fcli.fod.app.update.name = The updated name for the application.
@@ -252,16 +261,6 @@ fcli.fod.microservice.update.usage.header = Updates an existing application micr
 fcli.fod.microservice.update.name = The updated name for the microservice.
 fcli.fod.microservice.update.invalid-parameter = Unable to resolve application name and microservice name.
 
-
-### For the "fod lookup" command ###
-fcli.fod.lookup.usage.header = Manage FoD lookup items.
-
-# For the "fod lookup list" command
-fcli.fod.lookup.list.usage.header = List lookup items.
-fcli.fod.lookup.list.type = The type of lookup items to return. Valid values: ${COMPLETION-CANDIDATES}. \
-  Note: For 'LanguageLevels', the field 'group' indicates the 'TechnologyType Id'.
-
-
 ### For the "fod scan" command ###
 fcli.fod.scan.usage.header = Manage FoD scans.
 
@@ -303,8 +302,8 @@ fcli.fod.scan.setup-sast.usage.header = Set up a new SAST scan.
 fcli.fod.scan.setup-sast.entitlement-frequency = The Entitlement Frequency to use. Valid values: ${COMPLETION-CANDIDATES}.
 fcli.fod.scan.setup-sast.entitlement-id = Entitlement Id to use. If not specified Frequency and Assessment Type will be used to find one.
 fcli.fod.scan.setup-sast.assessment-type = The type of Static assessment to carry out. Valid values: ${COMPLETION-CANDIDATES}
-fcli.fod.scan.setup-sast.technology-stack = The technology stack of the application. Use `fcli fod lookup list --type TechnologyTypes` to see the values.
-fcli.fod.scan.setup-sast.language-level = The language level of the technology stack (if needed). Use `fcli fod lookup list --type LanguageLevels -q "group=XXX"` to see the values.
+fcli.fod.scan.setup-sast.technology-stack = The technology stack of the application.
+fcli.fod.scan.setup-sast.language-level = The language level of the technology stack (if needed).
 fcli.fod.scan.setup-sast.oss = Perform Open Source Analysis scan.
 fcli.fod.scan.setup-sast.audit-preference = Audit preference, e.g. Manual or Automated
 fcli.fod.scan.setup-sast.include-third-party-libs = Indicates if third party libraries should be included.
@@ -333,7 +332,7 @@ fcli.fod.scan.start-dast.entitlement-id = ${fcli.fod.scan.start-sast.entitlement
 fcli.fod.scan.start-dast.notes = ${fcli.fod.scan.start-sast.notes}
 fcli.fod.scan.start-dast.file = ${fcli.fod.scan.start-sast.file}
 fcli.fod.scan.start-dast.chunk-size = ${fcli.fod.scan.start-sast.chunk-size}
-fcli.fod.scan.start-dast.timezone = The timezone to use for starting the scan - default is UTC. Use `fcli fod lookup list --type TimeZones` to see the values.
+fcli.fod.scan.start-dast.timezone = The timezone to use for starting the scan - default is UTC. Use `fcli fod rest lookup --type TimeZones` to see the values.
 
 fcli.fod.scan.start-dast.validating-entitlement = Validating entitlements.
 fcli.fod.scan.start-dast.using-entitlement = Running scan using entitlement %s.
@@ -349,7 +348,7 @@ fcli.fod.scan.start-mobile.notes = ${fcli.fod.scan.start-sast.notes}
 fcli.fod.scan.start-mobile.file = ${fcli.fod.scan.start-sast.file}
 fcli.fod.scan.start-mobile.chunk-size = ${fcli.fod.scan.start-sast.chunk-size}
 fcli.fod.scan.start-mobile.framework = The Mobile Framework to use. Valid values: ${COMPLETION-CANDIDATES}.
-fcli.fod.scan.start-mobile.timezone = The timezone to use for starting the scan - default is UTC. Use `fcli fod lookup list --type TimeZones` to see the values.
+fcli.fod.scan.start-mobile.timezone = The timezone to use for starting the scan - default is UTC. Use `fcli fod rest lookup --type TimeZones` to see the values.
 fcli.fod.scan.start-mobile.validating-entitlement = Validating entitlements.
 fcli.fod.scan.start-mobile.using-entitlement = Running scan using entitlement %s.
 fcli.fod.scan.start-mobile.validating-remediation-entitlement = Validating remediation entitlements.
@@ -466,7 +465,7 @@ fcli.fod.microservice.output.header.releaseId = Release Id
 fcli.fod.microservice.output.header.releaseName = Release
 fcli.fod.microservice.output.header.applicationName = Application
 
-fcli.fod.lookup.output.table.options = group,text,value
+fcli.fod.rest.lookup.output.table.options = group,text,value
 
 fcli.fod.scan.output.table.options = scanId,scanType,analysisStatusType,applicationName,microserviceName,releaseName,startedDateTime,completedDateTime,scanMethodTypeName
 fcli.fod.scan.cancel.output.table.options = scanId,scanType,applicationName,microserviceName,releaseName,startedDateTime,completedDateTime,scanMethodTypeName
diff --git a/fcli-core/fcli-license/build.gradle b/fcli-core/fcli-license/build.gradle
new file mode 100644
index 0000000000..27341f11b8
--- /dev/null
+++ b/fcli-core/fcli-license/build.gradle
@@ -0,0 +1,5 @@
+apply from: "${sharedGradleScriptsDir}/fcli-module.gradle"
+
+dependencies {
+    implementation project("${fcliSSCRef}")
+}
\ No newline at end of file
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateCommands.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/_main/cli/cmd/LicenseCommands.java
similarity index 61%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateCommands.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/_main/cli/cmd/LicenseCommands.java
index fc9b85f744..c259e1268a 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateCommands.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/_main/cli/cmd/LicenseCommands.java
@@ -10,20 +10,20 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state._main.cli.cmd;
+package com.fortify.cli.license._main.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
-import com.fortify.cli.state.variable.cli.cmd.VariableCommands;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
+import com.fortify.cli.license.msp_report.cli.cmd.MspReportCommands;
+import com.fortify.cli.license.ncd_report.cli.cmd.NcdReportCommands;
 
 import picocli.CommandLine.Command;
 
 @Command(
-        name = "state",
-        resourceBundle = "com.fortify.cli.state.i18n.StateMessages",
+        name = "license",
+        resourceBundle = "com.fortify.cli.license.i18n.LicenseMessages",
         subcommands = {
-                StateClearCommand.class,
-                VariableCommands.class
+            MspReportCommands.class,
+            NcdReportCommands.class
         }
 )
-public class StateCommands extends AbstractFortifyCLICommand {
-}
+public class LicenseCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportCommands.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportCommands.java
similarity index 82%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportCommands.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportCommands.java
index 68fd880024..c5d5853f65 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportCommands.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportCommands.java
@@ -10,9 +10,9 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.cli.cmd;
+package com.fortify.cli.license.msp_report.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,4 +23,4 @@
             MspReportGenerateConfigCommand.class
         }
 )
-public class MspReportCommands extends AbstractFortifyCLICommand {}
+public class MspReportCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateCommand.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportGenerateCommand.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateCommand.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportGenerateCommand.java
index 88aaf5fb43..e9613eab23 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateCommand.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportGenerateCommand.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.cli.cmd;
+package com.fortify.cli.license.msp_report.cli.cmd;
 
 import java.io.File;
 import java.time.LocalDate;
@@ -19,8 +19,8 @@
 import com.fortify.cli.common.progress.helper.IProgressWriterI18n;
 import com.fortify.cli.common.report.cli.cmd.AbstractConfigurableReportGenerateCommand;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.msp_report.collector.MspReportResultsCollector;
-import com.fortify.cli.util.msp_report.config.MspReportConfig;
+import com.fortify.cli.license.msp_report.collector.MspReportResultsCollector;
+import com.fortify.cli.license.msp_report.config.MspReportConfig;
 
 import lombok.Getter;
 import picocli.CommandLine.Command;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateConfigCommand.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportGenerateConfigCommand.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateConfigCommand.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportGenerateConfigCommand.java
index 83f8babcd6..ae1298e3cf 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/cli/cmd/MspReportGenerateConfigCommand.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/cli/cmd/MspReportGenerateConfigCommand.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.cli.cmd;
+package com.fortify.cli.license.msp_report.cli.cmd;
 
 import com.fortify.cli.common.output.cli.cmd.AbstractGenerateConfigCommand;
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppCollector.java
similarity index 93%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppCollector.java
index 3605172416..d8425326d6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppCollector.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.collector;
+package com.fortify.cli.license.msp_report.collector;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,10 +21,10 @@
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
 import com.fortify.cli.common.util.Counter;
 import com.fortify.cli.common.util.StringUtils;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportLicenseType;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportProcessingStatus;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCProcessedAppDescriptor;
-import com.fortify.cli.util.msp_report.writer.MspReportResultsWriters;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportLicenseType;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportProcessingStatus;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCProcessedAppDescriptor;
+import com.fortify.cli.license.msp_report.writer.MspReportResultsWriters;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppScanCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppScanCollector.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppScanCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppScanCollector.java
index 7ee6667fd1..47b9bab0f6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppScanCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppScanCollector.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.collector;
+package com.fortify.cli.license.msp_report.collector;
 
 import java.time.LocalDateTime;
 import java.time.LocalTime;
@@ -24,12 +24,12 @@
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.config.MspReportConfig;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppDescriptor;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppSummaryDescriptor;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCScanDescriptor;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCScanType;
-import com.fortify.cli.util.msp_report.writer.MspReportResultsWriters;
+import com.fortify.cli.license.msp_report.config.MspReportConfig;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppSummaryDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCScanDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCScanType;
+import com.fortify.cli.license.msp_report.writer.MspReportResultsWriters;
 
 import lombok.Data;
 import lombok.Getter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppVersionCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppVersionCollector.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppVersionCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppVersionCollector.java
index 4d4342cc02..0655f2612a 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportAppVersionCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportAppVersionCollector.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.collector;
+package com.fortify.cli.license.msp_report.collector;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -20,9 +20,9 @@
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
 import com.fortify.cli.common.util.Counter;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportProcessingStatus;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCProcessedAppVersionDescriptor;
-import com.fortify.cli.util.msp_report.writer.MspReportResultsWriters;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportProcessingStatus;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCProcessedAppVersionDescriptor;
+import com.fortify.cli.license.msp_report.writer.MspReportResultsWriters;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportArtifactCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportArtifactCollector.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportArtifactCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportArtifactCollector.java
index 910e5d7fef..cf502d3615 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportArtifactCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportArtifactCollector.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.collector;
+package com.fortify.cli.license.msp_report.collector;
 
 import java.util.SortedMap;
 import java.util.TreeMap;
@@ -20,9 +20,9 @@
 import com.fortify.cli.common.output.transform.PropertyPathFormatter;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
 import com.fortify.cli.common.util.Counter;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionDescriptor;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCArtifactDescriptor;
-import com.fortify.cli.util.msp_report.writer.MspReportResultsWriters;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCArtifactDescriptor;
+import com.fortify.cli.license.msp_report.writer.MspReportResultsWriters;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportResultsCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportResultsCollector.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportResultsCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportResultsCollector.java
index 4ab31c958c..f7049e9172 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/collector/MspReportResultsCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/collector/MspReportResultsCollector.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.collector;
+package com.fortify.cli.license.msp_report.collector;
 
 import java.time.format.DateTimeFormatter;
 
@@ -20,10 +20,10 @@
 import com.fortify.cli.common.report.logger.ReportLogger;
 import com.fortify.cli.common.report.writer.IReportWriter;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.cli.cmd.MspReportGenerateCommand;
-import com.fortify.cli.util.msp_report.config.MspReportConfig;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppDescriptor;
-import com.fortify.cli.util.msp_report.writer.MspReportResultsWriters;
+import com.fortify.cli.license.msp_report.cli.cmd.MspReportGenerateCommand;
+import com.fortify.cli.license.msp_report.config.MspReportConfig;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppDescriptor;
+import com.fortify.cli.license.msp_report.writer.MspReportResultsWriters;
 
 import lombok.Getter;
 import lombok.SneakyThrows;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/IMspReportSourceConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/IMspReportSourceConfig.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/IMspReportSourceConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/IMspReportSourceConfig.java
index 2a13862425..ae67b245d1 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/IMspReportSourceConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/IMspReportSourceConfig.java
@@ -10,10 +10,10 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.config;
+package com.fortify.cli.license.msp_report.config;
 
 import com.fortify.cli.common.report.config.IReportSourceConfig;
-import com.fortify.cli.util.msp_report.collector.MspReportResultsCollector;
+import com.fortify.cli.license.msp_report.collector.MspReportResultsCollector;
 
 /**
  * Interface to be implemented by source-specific configuration classes
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportConfig.java
similarity index 95%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportConfig.java
index 6771780320..87fcc4b8aa 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.config;
+package com.fortify.cli.license.msp_report.config;
 
 import java.time.LocalDate;
 import java.util.Collection;
@@ -18,7 +18,7 @@
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.report.config.IReportSourceSupplierConfig;
-import com.fortify.cli.util.msp_report.collector.MspReportResultsCollector;
+import com.fortify.cli.license.msp_report.collector.MspReportResultsCollector;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSSCSourceConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportSSCSourceConfig.java
similarity index 88%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSSCSourceConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportSSCSourceConfig.java
index 8f01c2e46b..983aae11d8 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSSCSourceConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportSSCSourceConfig.java
@@ -10,13 +10,13 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.config;
+package com.fortify.cli.license.msp_report.config;
 
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.report.generator.IReportResultsGenerator;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.collector.MspReportResultsCollector;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCResultsGenerator;
+import com.fortify.cli.license.msp_report.collector.MspReportResultsCollector;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCResultsGenerator;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSourcesConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportSourcesConfig.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSourcesConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportSourcesConfig.java
index f5757db032..27e1c6a59b 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/config/MspReportSourcesConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/config/MspReportSourcesConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.config;
+package com.fortify.cli.license.msp_report.config;
 
 import java.util.List;
 import java.util.stream.Collectors;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java
index d0fa19fc3c..5c3bc26164 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/AbstractMspReportUnirestResultsGenerator.java
@@ -10,11 +10,11 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator;
+package com.fortify.cli.license.msp_report.generator;
 
 import com.fortify.cli.common.report.generator.AbstractReportUnirestResultsGenerator;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.collector.MspReportResultsCollector;
+import com.fortify.cli.license.msp_report.collector.MspReportResultsCollector;
 
 /**
  * Base class for source-specific unirest-based generator implementations, 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportLicenseType.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportLicenseType.java
similarity index 94%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportLicenseType.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportLicenseType.java
index 83e7173fcb..b5884e4890 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportLicenseType.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportLicenseType.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 import java.util.Arrays;
 import java.util.List;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportProcessingStatus.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportProcessingStatus.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportProcessingStatus.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportProcessingStatus.java
index 7cd1986f9a..ccb709af37 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportProcessingStatus.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportProcessingStatus.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 public enum MspReportProcessingStatus {
     error, warn, success
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppDescriptor.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppDescriptor.java
index 1d98410340..1e4c5e8bfe 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppDescriptor.java
@@ -10,11 +10,11 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Location;
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Name;
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_License_Type;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Location;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Name;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_License_Type;
 
 import java.time.ZonedDateTime;
 import java.util.ArrayList;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java
index c50a647f47..36ae9e7bdc 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppSummaryDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.util.Counter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java
similarity index 93%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java
index 5eb587890d..6a03304f6c 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppVersionAttribute.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 public enum MspReportSSCAppVersionAttribute {
     MSP_License_Type, MSP_End_Customer_Name, MSP_End_Customer_Location;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java
index cec663fdc4..e3c695b4b6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCAppVersionDescriptor.java
@@ -10,11 +10,11 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Location;
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Name;
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_License_Type;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Location;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Name;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_License_Type;
 
 import java.time.ZonedDateTime;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java
similarity index 98%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java
index c87ba0f211..b535fb26cd 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCArtifactDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 import java.time.LocalDateTime;
 import java.time.ZonedDateTime;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java
index 2f9f21e6f6..0db88d951e 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCProcessedAppDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java
similarity index 95%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java
index e49e3fd326..0f326505ae 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCProcessedAppVersionDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCResultsGenerator.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCResultsGenerator.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCResultsGenerator.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCResultsGenerator.java
index 2e8ec80e39..5c1d29fc10 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCResultsGenerator.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCResultsGenerator.java
@@ -10,16 +10,21 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Location;
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Name;
-import static com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_License_Type;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Location;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_End_Customer_Name;
+import static com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionAttribute.MSP_License_Type;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.util.StringUtils;
+import com.fortify.cli.license.msp_report.collector.MspReportAppScanCollector;
+import com.fortify.cli.license.msp_report.collector.MspReportResultsCollector;
+import com.fortify.cli.license.msp_report.collector.MspReportAppScanCollector.MspReportScanCollectorState;
+import com.fortify.cli.license.msp_report.config.MspReportSSCSourceConfig;
+import com.fortify.cli.license.msp_report.generator.AbstractMspReportUnirestResultsGenerator;
 import com.fortify.cli.ssc._common.rest.bulk.SSCBulkEmbedder;
 import com.fortify.cli.ssc._common.rest.helper.SSCInputTransformer;
 import com.fortify.cli.ssc._common.rest.helper.SSCPagingHelper;
@@ -28,11 +33,6 @@
 import com.fortify.cli.ssc.attribute_definition.domain.SSCAttributeDefinitionType;
 import com.fortify.cli.ssc.attribute_definition.helper.SSCAttributeDefinitionHelper;
 import com.fortify.cli.ssc.token.helper.SSCTokenConverter;
-import com.fortify.cli.util.msp_report.collector.MspReportAppScanCollector;
-import com.fortify.cli.util.msp_report.collector.MspReportAppScanCollector.MspReportScanCollectorState;
-import com.fortify.cli.util.msp_report.collector.MspReportResultsCollector;
-import com.fortify.cli.util.msp_report.config.MspReportSSCSourceConfig;
-import com.fortify.cli.util.msp_report.generator.AbstractMspReportUnirestResultsGenerator;
 
 import kong.unirest.HttpRequest;
 import kong.unirest.HttpResponse;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCScanDescriptor.java
similarity index 93%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCScanDescriptor.java
index 29963db9f7..c3768cffdb 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCScanDescriptor.java
@@ -10,14 +10,14 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 import java.time.LocalDateTime;
 import java.util.stream.Stream;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCArtifactDescriptor.MspReportSSCArtifactScanDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCArtifactDescriptor.MspReportSSCArtifactScanDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanType.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCScanType.java
similarity index 94%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanType.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCScanType.java
index 6b94ab1083..83ac78df78 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/generator/ssc/MspReportSSCScanType.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/generator/ssc/MspReportSSCScanType.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.generator.ssc;
+package com.fortify.cli.license.msp_report.generator.ssc;
 
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppVersionsWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportAppVersionsWriter.java
similarity index 85%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppVersionsWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportAppVersionsWriter.java
index 3d0e281ee7..096b2d670f 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppVersionsWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportAppVersionsWriter.java
@@ -10,10 +10,10 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCProcessedAppVersionDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCProcessedAppVersionDescriptor;
 
 public interface IMspReportAppVersionsWriter {
     void write(IUrlConfig urlConfig, MspReportSSCProcessedAppVersionDescriptor descriptor);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppsWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportAppsWriter.java
similarity index 85%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppsWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportAppsWriter.java
index 3b4b987026..8c70a2911b 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportAppsWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportAppsWriter.java
@@ -10,10 +10,10 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCProcessedAppDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCProcessedAppDescriptor;
 
 public interface IMspReportAppsWriter {
     void write(IUrlConfig urlConfig, MspReportSSCProcessedAppDescriptor descriptor);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportArtifactsWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportArtifactsWriter.java
similarity index 80%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportArtifactsWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportArtifactsWriter.java
index 559aa87d44..99bf7f8dcc 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportArtifactsWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportArtifactsWriter.java
@@ -10,11 +10,11 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionDescriptor;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCArtifactDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCArtifactDescriptor;
 
 public interface IMspReportArtifactsWriter {
     void write(IUrlConfig urlConfig, MspReportSSCAppVersionDescriptor versionDescriptor, MspReportSSCArtifactDescriptor artifactDescriptor);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportScansWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportScansWriter.java
similarity index 85%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportScansWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportScansWriter.java
index eda9fd46d2..d14ff27ad9 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/IMspReportScansWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/IMspReportScansWriter.java
@@ -10,9 +10,9 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
-import com.fortify.cli.util.msp_report.collector.MspReportAppScanCollector.MspReportProcessedScanDescriptor;
+import com.fortify.cli.license.msp_report.collector.MspReportAppScanCollector.MspReportProcessedScanDescriptor;
 
 public interface IMspReportScansWriter {
     void writeProcessed(MspReportProcessedScanDescriptor descriptor);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppVersionsWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportAppVersionsWriter.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppVersionsWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportAppVersionsWriter.java
index d2f26c7d44..480110c7c4 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppVersionsWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportAppVersionsWriter.java
@@ -10,14 +10,14 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCProcessedAppVersionDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCProcessedAppVersionDescriptor;
 
 public final class MspReportAppVersionsWriter implements IMspReportAppVersionsWriter {
     private final IRecordWriter recordWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppsWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportAppsWriter.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppsWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportAppsWriter.java
index ca7c0c8561..48779d43c6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportAppsWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportAppsWriter.java
@@ -10,14 +10,14 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCProcessedAppDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCProcessedAppDescriptor;
 
 public final class MspReportAppsWriter implements IMspReportAppsWriter {
     private final IRecordWriter recordWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportArtifactsWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportArtifactsWriter.java
similarity index 90%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportArtifactsWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportArtifactsWriter.java
index 8d1bf222e0..a56d04f3f5 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportArtifactsWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportArtifactsWriter.java
@@ -10,15 +10,15 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCAppVersionDescriptor;
-import com.fortify.cli.util.msp_report.generator.ssc.MspReportSSCArtifactDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCAppVersionDescriptor;
+import com.fortify.cli.license.msp_report.generator.ssc.MspReportSSCArtifactDescriptor;
 
 public final class MspReportArtifactsWriter implements IMspReportArtifactsWriter {
     private final IRecordWriter artifactsRecordWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportResultsWriters.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportResultsWriters.java
similarity index 97%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportResultsWriters.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportResultsWriters.java
index fe555ce64b..d69c54a182 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportResultsWriters.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportResultsWriters.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
 import com.fortify.cli.common.progress.helper.IProgressWriterI18n;
 import com.fortify.cli.common.report.logger.IReportLogger;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportScansWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportScansWriter.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportScansWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportScansWriter.java
index 5640461f4e..cf5412bb92 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/msp_report/writer/MspReportScansWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/msp_report/writer/MspReportScansWriter.java
@@ -10,12 +10,12 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.msp_report.writer;
+package com.fortify.cli.license.msp_report.writer;
 
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.msp_report.collector.MspReportAppScanCollector.MspReportProcessedScanDescriptor;
+import com.fortify.cli.license.msp_report.collector.MspReportAppScanCollector.MspReportProcessedScanDescriptor;
 
 public final class MspReportScansWriter implements IMspReportScansWriter {
     private final IRecordWriter processedArtifactsWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportCommands.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportCommands.java
similarity index 82%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportCommands.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportCommands.java
index 6235e4866b..af49661e99 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportCommands.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportCommands.java
@@ -10,9 +10,9 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.cli.cmd;
+package com.fortify.cli.license.ncd_report.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,4 +23,4 @@
             NcdReportGenerateConfigCommand.class
         }
 )
-public class NcdReportCommands extends AbstractFortifyCLICommand {}
+public class NcdReportCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateCommand.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportGenerateCommand.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateCommand.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportGenerateCommand.java
index 8d8574d601..a45bf24eaf 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateCommand.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportGenerateCommand.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.cli.cmd;
+package com.fortify.cli.license.ncd_report.cli.cmd;
 
 import java.io.File;
 
@@ -18,8 +18,8 @@
 import com.fortify.cli.common.progress.helper.IProgressWriterI18n;
 import com.fortify.cli.common.report.cli.cmd.AbstractConfigurableReportGenerateCommand;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.ncd_report.collector.NcdReportResultsCollector;
-import com.fortify.cli.util.ncd_report.config.NcdReportConfig;
+import com.fortify.cli.license.ncd_report.collector.NcdReportResultsCollector;
+import com.fortify.cli.license.ncd_report.config.NcdReportConfig;
 
 import lombok.Getter;
 import picocli.CommandLine.Command;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java
index 1dee8a3510..8ce81f659a 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/cli/cmd/NcdReportGenerateConfigCommand.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.cli.cmd;
+package com.fortify.cli.license.ncd_report.cli.cmd;
 
 import com.fortify.cli.common.output.cli.cmd.AbstractGenerateConfigCommand;
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java
index 75e0eff095..0b2a7317f5 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/INcdReportRepositoryBranchCommitCollector.java
@@ -10,9 +10,9 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
 
 /**
  * This interface is to be implemented by classes that can collect
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryProcessor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/INcdReportRepositoryProcessor.java
similarity index 84%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryProcessor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/INcdReportRepositoryProcessor.java
index 43a6f33ce9..603781f2d3 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/INcdReportRepositoryProcessor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/INcdReportRepositoryProcessor.java
@@ -10,11 +10,11 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
-import com.fortify.cli.util.ncd_report.config.INcdReportRepoSelectorConfig;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.generator.INcdReportBranchCommitGenerator;
+import com.fortify.cli.license.ncd_report.config.INcdReportRepoSelectorConfig;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.generator.INcdReportBranchCommitGenerator;
 
 /**
  * This interface is to be implemented by classes that can process
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorCollector.java
similarity index 90%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorCollector.java
index 60f4f7f1bf..da0c310bbe 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorCollector.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
 import java.util.HashMap;
 import java.util.Map;
@@ -21,13 +21,13 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
-import com.fortify.cli.util.ncd_report.config.NcdReportConfig;
-import com.fortify.cli.util.ncd_report.config.NcdReportContributorConfig;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportAuthorDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor.NcdReportProcessedAuthorState;
-import com.fortify.cli.util.ncd_report.writer.INcdReportAuthorsWriter;
-import com.fortify.cli.util.ncd_report.writer.NcdReportResultsWriters;
+import com.fortify.cli.license.ncd_report.config.NcdReportConfig;
+import com.fortify.cli.license.ncd_report.config.NcdReportContributorConfig;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor.NcdReportProcessedAuthorState;
+import com.fortify.cli.license.ncd_report.writer.INcdReportAuthorsWriter;
+import com.fortify.cli.license.ncd_report.writer.NcdReportResultsWriters;
 
 import lombok.SneakyThrows;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicator.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicator.java
similarity index 97%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicator.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicator.java
index 5976d25a6c..1b171f5241 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicator.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicator.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
 import java.util.LinkedHashSet;
 import java.util.Map.Entry;
@@ -23,8 +23,8 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
-import com.fortify.cli.util.ncd_report.config.NcdReportContributorConfig;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.config.NcdReportContributorConfig;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 import lombok.Getter;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java
similarity index 87%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java
index dea8758a2e..99fdfce035 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryBranchCommitCollector.java
@@ -10,19 +10,19 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
 import java.util.LinkedHashMap;
 import java.util.LinkedHashSet;
 import java.util.Map;
 import java.util.Set;
 
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportCommitDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
-import com.fortify.cli.util.ncd_report.generator.INcdReportBranchCommitGenerator;
-import com.fortify.cli.util.ncd_report.writer.NcdReportResultsWriters;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.generator.INcdReportBranchCommitGenerator;
+import com.fortify.cli.license.ncd_report.writer.NcdReportResultsWriters;
 
 import lombok.RequiredArgsConstructor;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryCollector.java
similarity index 90%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryCollector.java
index c6ab4ef1ba..3157e79dd5 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryCollector.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
 import java.util.HashMap;
 import java.util.LinkedHashSet;
@@ -20,9 +20,9 @@
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.writer.NcdReportRepositoriesWriter.NcdReportRepositoryReportingStatus;
-import com.fortify.cli.util.ncd_report.writer.NcdReportResultsWriters;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.writer.NcdReportResultsWriters;
+import com.fortify.cli.license.ncd_report.writer.NcdReportRepositoriesWriter.NcdReportRepositoryReportingStatus;
 
 import lombok.RequiredArgsConstructor;
 import lombok.SneakyThrows;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryProcessor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryProcessor.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryProcessor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryProcessor.java
index df86c046cb..af7b6b479c 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportRepositoryProcessor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportRepositoryProcessor.java
@@ -10,17 +10,17 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.util.StringUtils;
-import com.fortify.cli.util.ncd_report.config.INcdReportRepoSelectorConfig;
-import com.fortify.cli.util.ncd_report.config.NcdReportConfig;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.generator.INcdReportBranchCommitGenerator;
-import com.fortify.cli.util.ncd_report.writer.NcdReportRepositoriesWriter.NcdReportRepositoryReportingStatus;
-import com.fortify.cli.util.ncd_report.writer.NcdReportResultsWriters;
+import com.fortify.cli.license.ncd_report.config.INcdReportRepoSelectorConfig;
+import com.fortify.cli.license.ncd_report.config.NcdReportConfig;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.generator.INcdReportBranchCommitGenerator;
+import com.fortify.cli.license.ncd_report.writer.NcdReportResultsWriters;
+import com.fortify.cli.license.ncd_report.writer.NcdReportRepositoriesWriter.NcdReportRepositoryReportingStatus;
 
 /**
  * <p>This class is responsible for processing repositories passed to 
@@ -80,7 +80,7 @@ public <R extends INcdReportRepositoryDescriptor> void processRepository(
 
     private <R extends INcdReportRepositoryDescriptor> void processRepository(R repoDescriptor, INcdReportBranchCommitGenerator<R> branchCommitGenerator) {
         var branchCommitsCollector = new NcdReportRepositoryBranchCommitCollector(authorCollector, repoDescriptor);
-        writers.progressWriter().writeI18nProgress("fcli.util.ncd-report.loading.commits", repoDescriptor.getFullName());
+        writers.progressWriter().writeI18nProgress("fcli.license.ncd-report.loading.commits", repoDescriptor.getFullName());
         branchCommitGenerator.generateBranchCommitData(repoDescriptor, branchCommitsCollector);
         if ( branchCommitsCollector.isEmpty() ) {
             repositoryCollector.reportRepository(repoDescriptor, NcdReportRepositoryReportingStatus.empty, "No commits found");
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportResultsCollector.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportResultsCollector.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportResultsCollector.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportResultsCollector.java
index d63358481a..85044eca6a 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/collector/NcdReportResultsCollector.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/collector/NcdReportResultsCollector.java
@@ -10,16 +10,16 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
 import com.fortify.cli.common.progress.helper.IProgressWriterI18n;
 import com.fortify.cli.common.report.collector.IReportResultsCollector;
 import com.fortify.cli.common.report.logger.IReportLogger;
 import com.fortify.cli.common.report.logger.ReportLogger;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.ncd_report.cli.cmd.NcdReportGenerateCommand;
-import com.fortify.cli.util.ncd_report.config.NcdReportConfig;
-import com.fortify.cli.util.ncd_report.writer.NcdReportResultsWriters;
+import com.fortify.cli.license.ncd_report.cli.cmd.NcdReportGenerateCommand;
+import com.fortify.cli.license.ncd_report.config.NcdReportConfig;
+import com.fortify.cli.license.ncd_report.writer.NcdReportResultsWriters;
 
 import lombok.Getter;
 import lombok.SneakyThrows;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java
index 671654fc8d..4ce9a8a24f 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/AbstractNcdReportRepoSelectorConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import java.util.Optional;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportRepoSelectorConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/INcdReportRepoSelectorConfig.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportRepoSelectorConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/INcdReportRepoSelectorConfig.java
index 5c57d8eb25..3318c04f97 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportRepoSelectorConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/INcdReportRepoSelectorConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import java.util.Optional;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportSourceConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/INcdReportSourceConfig.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportSourceConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/INcdReportSourceConfig.java
index cce6a9a93a..d04b25e24f 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/INcdReportSourceConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/INcdReportSourceConfig.java
@@ -10,10 +10,10 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import com.fortify.cli.common.report.config.IReportSourceConfig;
-import com.fortify.cli.util.ncd_report.collector.NcdReportResultsCollector;
+import com.fortify.cli.license.ncd_report.collector.NcdReportResultsCollector;
 
 /**
  * Interface to be implemented by source-specific configuration classes
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java
index a7ca3409af..24b6f1b304 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportCombinedRepoSelectorConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import java.util.Optional;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportConfig.java
similarity index 93%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportConfig.java
index 6c3bcefa08..6c1d6109ee 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import java.time.OffsetDateTime;
 import java.util.Collection;
@@ -20,7 +20,7 @@
 import com.fortify.cli.common.report.config.IReportSourceSupplierConfig;
 import com.fortify.cli.common.util.DateTimePeriodHelper;
 import com.fortify.cli.common.util.DateTimePeriodHelper.Period;
-import com.fortify.cli.util.ncd_report.collector.NcdReportResultsCollector;
+import com.fortify.cli.license.ncd_report.collector.NcdReportResultsCollector;
 
 import lombok.Data;
 import lombok.NoArgsConstructor;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportContributorConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportContributorConfig.java
similarity index 95%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportContributorConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportContributorConfig.java
index 4c0b56561b..7b0ab628f5 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportContributorConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportContributorConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import java.util.Optional;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubOrganizationConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitHubOrganizationConfig.java
similarity index 95%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubOrganizationConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitHubOrganizationConfig.java
index 110c1b383f..b189a6f52a 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubOrganizationConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitHubOrganizationConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import com.formkiq.graalvm.annotations.Reflectable;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubSourceConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitHubSourceConfig.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubSourceConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitHubSourceConfig.java
index 25f6470203..53094c0f92 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitHubSourceConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitHubSourceConfig.java
@@ -10,13 +10,13 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.report.generator.IReportResultsGenerator;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.ncd_report.collector.NcdReportResultsCollector;
-import com.fortify.cli.util.ncd_report.generator.github.NcdReportGitHubResultsGenerator;
+import com.fortify.cli.license.ncd_report.collector.NcdReportResultsCollector;
+import com.fortify.cli.license.ncd_report.generator.github.NcdReportGitHubResultsGenerator;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabGroupConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitLabGroupConfig.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabGroupConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitLabGroupConfig.java
index d6ed729923..ea4804dc80 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabGroupConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitLabGroupConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import java.util.Optional;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabSourceConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitLabSourceConfig.java
similarity index 90%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabSourceConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitLabSourceConfig.java
index 59f21fb5e4..c810ec14f4 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportGitLabSourceConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportGitLabSourceConfig.java
@@ -10,15 +10,15 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import java.util.Optional;
 
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.report.generator.IReportResultsGenerator;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.ncd_report.collector.NcdReportResultsCollector;
-import com.fortify.cli.util.ncd_report.generator.gitlab.NcdReportGitLabResultsGenerator;
+import com.fortify.cli.license.ncd_report.collector.NcdReportResultsCollector;
+import com.fortify.cli.license.ncd_report.generator.gitlab.NcdReportGitLabResultsGenerator;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportSourcesConfig.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportSourcesConfig.java
similarity index 97%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportSourcesConfig.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportSourcesConfig.java
index 09b1494b1f..1455540bba 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/config/NcdReportSourcesConfig.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/config/NcdReportSourcesConfig.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.config;
+package com.fortify.cli.license.ncd_report.config;
 
 import java.util.List;
 import java.util.Optional;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportAuthorDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportAuthorDescriptor.java
similarity index 97%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportAuthorDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportAuthorDescriptor.java
index 67f873a1fa..d7fa7cf704 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportAuthorDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportAuthorDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.descriptor;
+package com.fortify.cli.license.ncd_report.descriptor;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.fortify.cli.common.json.JsonHelper;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportBranchDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportBranchDescriptor.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportBranchDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportBranchDescriptor.java
index 289710b523..07ab031617 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportBranchDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportBranchDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.descriptor;
+package com.fortify.cli.license.ncd_report.descriptor;
 
 import com.fortify.cli.common.json.JsonNodeHolder;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportCommitDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportCommitDescriptor.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportCommitDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportCommitDescriptor.java
index 0e988e3cb4..d5161f8700 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportCommitDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportCommitDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.descriptor;
+package com.fortify.cli.license.ncd_report.descriptor;
 
 import java.time.LocalDateTime;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportRepositoryDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportRepositoryDescriptor.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportRepositoryDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportRepositoryDescriptor.java
index 9e326b7a47..1d4cc819fd 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/INcdReportRepositoryDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/INcdReportRepositoryDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.descriptor;
+package com.fortify.cli.license.ncd_report.descriptor;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.json.JsonNodeHolder;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java
index 7e2ff878c1..87f8e4f10a 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/NcdReportBranchCommitDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.descriptor;
+package com.fortify.cli.license.ncd_report.descriptor;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java
index 4d1c770197..0ba6e38af6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/descriptor/NcdReportProcessedAuthorDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.descriptor;
+package com.fortify.cli.license.ncd_report.descriptor;
 
 import com.fasterxml.jackson.databind.node.ObjectNode;
 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java
index 22fb20c97b..d85289ecc4 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/AbstractNcdReportUnirestResultsGenerator.java
@@ -10,11 +10,11 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator;
+package com.fortify.cli.license.ncd_report.generator;
 
 import com.fortify.cli.common.report.generator.AbstractReportUnirestResultsGenerator;
 import com.fortify.cli.common.rest.unirest.config.IUrlConfig;
-import com.fortify.cli.util.ncd_report.collector.NcdReportResultsCollector;
+import com.fortify.cli.license.ncd_report.collector.NcdReportResultsCollector;
 
 /**
  * Base class for source-specific unirest-based generator implementations, 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/INcdReportBranchCommitGenerator.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/INcdReportBranchCommitGenerator.java
similarity index 86%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/INcdReportBranchCommitGenerator.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/INcdReportBranchCommitGenerator.java
index 6d9f9e11bd..5fb75728a3 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/INcdReportBranchCommitGenerator.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/INcdReportBranchCommitGenerator.java
@@ -10,10 +10,10 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator;
+package com.fortify.cli.license.ncd_report.generator;
 
-import com.fortify.cli.util.ncd_report.collector.INcdReportRepositoryBranchCommitCollector;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.collector.INcdReportRepositoryBranchCommitCollector;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
 
 /**
  * <p>Functional interface defining the process for generating and reporting branch, 
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/GitHubPagingHelper.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/GitHubPagingHelper.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/GitHubPagingHelper.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/GitHubPagingHelper.java
index 2100bd1f43..46a80b0fa6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/GitHubPagingHelper.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/GitHubPagingHelper.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.github;
+package com.fortify.cli.license.ncd_report.generator.github;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.rest.paging.INextPageUrlProducer;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java
index 3fee946e5c..c53714fea4 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubAuthorDescriptor.java
@@ -10,14 +10,14 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.github;
+package com.fortify.cli.license.ncd_report.generator.github;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportAuthorDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java
similarity index 89%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java
index a144dc9a7b..bd0544a229 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubBranchDescriptor.java
@@ -10,11 +10,11 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.github;
+package com.fortify.cli.license.ncd_report.generator.github;
 
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportBranchDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportBranchDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java
index 3eaed87c68..333979ec75 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubCommitDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.github;
+package com.fortify.cli.license.ncd_report.generator.github;
 
 import java.time.LocalDateTime;
 
@@ -19,7 +19,7 @@
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportCommitDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java
index ea621c8f84..ccca624cab 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubRepositoryDescriptor.java
@@ -10,13 +10,13 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.github;
+package com.fortify.cli.license.ncd_report.generator.github;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java
index d8370b4b98..05ee4a3c78 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/github/NcdReportGitHubResultsGenerator.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.github;
+package com.fortify.cli.license.ncd_report.generator.github;
 
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -21,14 +21,14 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.util.StringUtils;
-import com.fortify.cli.util.ncd_report.collector.INcdReportRepositoryBranchCommitCollector;
-import com.fortify.cli.util.ncd_report.collector.INcdReportRepositoryProcessor;
-import com.fortify.cli.util.ncd_report.collector.NcdReportResultsCollector;
-import com.fortify.cli.util.ncd_report.config.NcdReportCombinedRepoSelectorConfig;
-import com.fortify.cli.util.ncd_report.config.NcdReportGitHubOrganizationConfig;
-import com.fortify.cli.util.ncd_report.config.NcdReportGitHubSourceConfig;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
-import com.fortify.cli.util.ncd_report.generator.AbstractNcdReportUnirestResultsGenerator;
+import com.fortify.cli.license.ncd_report.collector.INcdReportRepositoryBranchCommitCollector;
+import com.fortify.cli.license.ncd_report.collector.INcdReportRepositoryProcessor;
+import com.fortify.cli.license.ncd_report.collector.NcdReportResultsCollector;
+import com.fortify.cli.license.ncd_report.config.NcdReportCombinedRepoSelectorConfig;
+import com.fortify.cli.license.ncd_report.config.NcdReportGitHubOrganizationConfig;
+import com.fortify.cli.license.ncd_report.config.NcdReportGitHubSourceConfig;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
+import com.fortify.cli.license.ncd_report.generator.AbstractNcdReportUnirestResultsGenerator;
 
 import kong.unirest.GetRequest;
 import kong.unirest.HttpRequest;
@@ -74,7 +74,7 @@ protected void generateResults() {
     private void generateResults(NcdReportGitHubOrganizationConfig orgConfig) {
         String orgName = orgConfig.getName();
         try {
-            resultsCollector().progressWriter().writeI18nProgress("fcli.util.ncd-report.loading.github-repositories", orgName);
+            resultsCollector().progressWriter().writeI18nProgress("fcli.license.ncd-report.loading.github-repositories", orgName);
             HttpRequest<?> req = unirest().get("/orgs/{org}/repos?type=all&per_page=100").routeParam("org", orgName);
             GitHubPagingHelper.pagedRequest(req, ArrayNode.class)
                 .ifSuccess(r->r.getBody().forEach(repo->
@@ -133,7 +133,7 @@ private boolean generateCommitDataForBranches(INcdReportRepositoryBranchCommitCo
                 .format(DateTimeFormatter.ISO_INSTANT);
         boolean commitsFound = false;
         for ( var branchDescriptor : branchDescriptors ) {
-            resultsCollector().progressWriter().writeI18nProgress("fcli.util.ncd-report.loading.branch-commits", repoDescriptor.getFullName(), branchDescriptor.getName());
+            resultsCollector().progressWriter().writeI18nProgress("fcli.license.ncd-report.loading.branch-commits", repoDescriptor.getFullName(), branchDescriptor.getName());
             HttpRequest<?> req = getCommitsRequest(repoDescriptor, branchDescriptor, 100)
                     .queryString("since", since);
             
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/GitLabPagingHelper.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/GitLabPagingHelper.java
similarity index 96%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/GitLabPagingHelper.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/GitLabPagingHelper.java
index 3736300954..041ec634db 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/GitLabPagingHelper.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/GitLabPagingHelper.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.gitlab;
+package com.fortify.cli.license.ncd_report.generator.gitlab;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.rest.paging.INextPageUrlProducer;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java
similarity index 90%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java
index b4c582cf81..206953d328 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabAuthorDescriptor.java
@@ -10,12 +10,12 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.gitlab;
+package com.fortify.cli.license.ncd_report.generator.gitlab;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportAuthorDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java
similarity index 91%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java
index 6ea25969c6..0a653e9c80 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabBranchDescriptor.java
@@ -10,13 +10,13 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.gitlab;
+package com.fortify.cli.license.ncd_report.generator.gitlab;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportBranchDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportBranchDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java
index b36284f732..05b175e2be 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabCommitDescriptor.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.gitlab;
+package com.fortify.cli.license.ncd_report.generator.gitlab;
 
 import java.time.LocalDateTime;
 
@@ -19,7 +19,7 @@
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportCommitDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java
similarity index 93%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java
index e6daa44620..094f24a36f 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabRepositoryDescriptor.java
@@ -10,13 +10,13 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.gitlab;
+package com.fortify.cli.license.ncd_report.generator.gitlab;
 
 import com.fasterxml.jackson.annotation.JsonProperty;
 import com.fasterxml.jackson.databind.node.ObjectNode;
 import com.formkiq.graalvm.annotations.Reflectable;
 import com.fortify.cli.common.json.JsonNodeHolder;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
 
 import lombok.Data;
 import lombok.EqualsAndHashCode;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java
similarity index 92%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java
index 4cd7b4f6f2..a912543de4 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/generator/gitlab/NcdReportGitLabResultsGenerator.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.generator.gitlab;
+package com.fortify.cli.license.ncd_report.generator.gitlab;
 
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
@@ -21,15 +21,15 @@
 import com.fasterxml.jackson.databind.node.ArrayNode;
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.util.StringUtils;
-import com.fortify.cli.util.ncd_report.collector.INcdReportRepositoryBranchCommitCollector;
-import com.fortify.cli.util.ncd_report.collector.INcdReportRepositoryProcessor;
-import com.fortify.cli.util.ncd_report.collector.NcdReportResultsCollector;
-import com.fortify.cli.util.ncd_report.config.NcdReportCombinedRepoSelectorConfig;
-import com.fortify.cli.util.ncd_report.config.NcdReportGitLabGroupConfig;
-import com.fortify.cli.util.ncd_report.config.NcdReportGitLabSourceConfig;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
-import com.fortify.cli.util.ncd_report.generator.AbstractNcdReportUnirestResultsGenerator;
-import com.fortify.cli.util.ncd_report.generator.github.GitHubPagingHelper;
+import com.fortify.cli.license.ncd_report.collector.INcdReportRepositoryBranchCommitCollector;
+import com.fortify.cli.license.ncd_report.collector.INcdReportRepositoryProcessor;
+import com.fortify.cli.license.ncd_report.collector.NcdReportResultsCollector;
+import com.fortify.cli.license.ncd_report.config.NcdReportCombinedRepoSelectorConfig;
+import com.fortify.cli.license.ncd_report.config.NcdReportGitLabGroupConfig;
+import com.fortify.cli.license.ncd_report.config.NcdReportGitLabSourceConfig;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
+import com.fortify.cli.license.ncd_report.generator.AbstractNcdReportUnirestResultsGenerator;
+import com.fortify.cli.license.ncd_report.generator.github.GitHubPagingHelper;
 
 import kong.unirest.GetRequest;
 import kong.unirest.HttpRequest;
@@ -78,7 +78,7 @@ private void generateResults(NcdReportGitLabGroupConfig groupConfig) {
         String groupId = groupConfig.getId();
         try {
             boolean includeSubgroups = groupConfig.getIncludeSubgroups().orElse(sourceConfig().getIncludeSubgroups().orElse(true));
-            resultsCollector().progressWriter().writeI18nProgress("fcli.util.ncd-report.loading.gitlab-repositories", groupId);
+            resultsCollector().progressWriter().writeI18nProgress("fcli.license.ncd-report.loading.gitlab-repositories", groupId);
             HttpRequest<?> req = unirest().get("/api/v4/groups/{id}/projects?per_page=100")
                     .routeParam("id", groupId)
                     .queryString("include_subgroups", includeSubgroups);
@@ -139,7 +139,7 @@ private boolean generateCommitDataForBranches(INcdReportRepositoryBranchCommitCo
                 .format(DateTimeFormatter.ISO_INSTANT);
         boolean commitsFound = false;
         for ( var branchDescriptor : branchDescriptors ) {
-            resultsCollector().progressWriter().writeI18nProgress("fcli.util.ncd-report.loading.branch-commits", repoDescriptor.getFullName(), branchDescriptor.getName());
+            resultsCollector().progressWriter().writeI18nProgress("fcli.license.ncd-report.loading.branch-commits", repoDescriptor.getFullName(), branchDescriptor.getName());
             HttpRequest<?> req = getCommitsRequest(repoDescriptor, branchDescriptor, 100)
                     .queryString("since", since);
             
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/package-info.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/package-info.java
similarity index 99%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/package-info.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/package-info.java
index dd7a5aa694..a6a9e454d1 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/package-info.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/package-info.java
@@ -96,4 +96,4 @@
  * </ol>
  * 
  */
-package com.fortify.cli.util.ncd_report;
+package com.fortify.cli.license.ncd_report;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java
similarity index 79%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java
index 912884a47a..d47a97f943 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportAuthorsByRepositoryWriter.java
@@ -10,10 +10,10 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 public interface INcdReportAuthorsByRepositoryWriter {
     void writeRepositoryAuthor(INcdReportRepositoryDescriptor repositoryDescriptor, NcdReportProcessedAuthorDescriptor contributorDescriptor);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportAuthorsWriter.java
similarity index 87%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportAuthorsWriter.java
index 68eabaf4ba..97f951331f 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportAuthorsWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportAuthorsWriter.java
@@ -10,9 +10,9 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 public interface INcdReportAuthorsWriter {
     void writeIgnoredAuthor(NcdReportProcessedAuthorDescriptor descriptor);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByBranchWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportCommitsByBranchWriter.java
similarity index 79%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByBranchWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportCommitsByBranchWriter.java
index 0f96fcbc9c..6332a3a420 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByBranchWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportCommitsByBranchWriter.java
@@ -10,10 +10,10 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 public interface INcdReportCommitsByBranchWriter {
     void writeBranchCommit(NcdReportBranchCommitDescriptor descriptor, NcdReportProcessedAuthorDescriptor processedAuthorDescriptor);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java
similarity index 75%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java
index f9ed0f652c..00f89cbe22 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportCommitsByRepositoryWriter.java
@@ -10,11 +10,11 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportCommitDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 public interface INcdReportCommitsByRepositoryWriter {
     void writeRepositoryCommit(INcdReportRepositoryDescriptor repositoryDescriptor, INcdReportCommitDescriptor commitDescriptor, NcdReportProcessedAuthorDescriptor contributorDescriptor);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportRepositoriesWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportRepositoriesWriter.java
similarity index 77%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportRepositoriesWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportRepositoriesWriter.java
index 17c061ed7a..9038b7dc41 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/INcdReportRepositoriesWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/INcdReportRepositoriesWriter.java
@@ -10,10 +10,10 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.writer.NcdReportRepositoriesWriter.NcdReportRepositoryReportingStatus;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.writer.NcdReportRepositoriesWriter.NcdReportRepositoryReportingStatus;
 
 public interface INcdReportRepositoriesWriter {
     void writeRepository(INcdReportRepositoryDescriptor descriptor, NcdReportRepositoryReportingStatus status, String reason);
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java
similarity index 88%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java
index ac69de8e88..c5da2ad6b6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportAuthorsByRepositoryWriter.java
@@ -10,14 +10,14 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 public final class NcdReportAuthorsByRepositoryWriter implements INcdReportAuthorsByRepositoryWriter {
     private final IRecordWriter recordWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportAuthorsWriter.java
similarity index 93%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportAuthorsWriter.java
index 4d03dcc1e0..c4a2c1f871 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportAuthorsWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportAuthorsWriter.java
@@ -10,13 +10,13 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 public final class NcdReportAuthorsWriter implements INcdReportAuthorsWriter {
     private final IRecordWriter recordWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByBranchWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportCommitsByBranchWriter.java
similarity index 90%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByBranchWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportCommitsByBranchWriter.java
index 066f26174d..0c2c9c4582 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByBranchWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportCommitsByBranchWriter.java
@@ -10,14 +10,14 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportBranchCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 public final class NcdReportCommitsByBranchWriter implements INcdReportCommitsByBranchWriter {
     private final IRecordWriter recordWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java
similarity index 86%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java
index e0cfb76658..7afdd8a875 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportCommitsByRepositoryWriter.java
@@ -10,15 +10,15 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportCommitDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportCommitDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
 
 public final class NcdReportCommitsByRepositoryWriter implements INcdReportCommitsByRepositoryWriter {
     private final IRecordWriter recordWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportRepositoriesWriter.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportRepositoriesWriter.java
similarity index 93%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportRepositoriesWriter.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportRepositoriesWriter.java
index 7995ff9a28..aa45d54307 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportRepositoriesWriter.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportRepositoriesWriter.java
@@ -10,13 +10,13 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
 import com.fortify.cli.common.json.JsonHelper;
 import com.fortify.cli.common.output.OutputFormat;
 import com.fortify.cli.common.output.writer.record.IRecordWriter;
 import com.fortify.cli.common.report.writer.IReportWriter;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportRepositoryDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportRepositoryDescriptor;
 
 public final class NcdReportRepositoriesWriter implements INcdReportRepositoriesWriter {
     private final IRecordWriter recordWriter;
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportResultsWriters.java b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportResultsWriters.java
similarity index 97%
rename from fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportResultsWriters.java
rename to fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportResultsWriters.java
index 301dd3b099..f45d44388e 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/ncd_report/writer/NcdReportResultsWriters.java
+++ b/fcli-core/fcli-license/src/main/java/com/fortify/cli/license/ncd_report/writer/NcdReportResultsWriters.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.writer;
+package com.fortify.cli.license.ncd_report.writer;
 
 import com.fortify.cli.common.progress.helper.IProgressWriterI18n;
 import com.fortify.cli.common.report.logger.IReportLogger;
diff --git a/fcli-core/fcli-license/src/main/resources/com/fortify/cli/license/i18n/LicenseMessages.properties b/fcli-core/fcli-license/src/main/resources/com/fortify/cli/license/i18n/LicenseMessages.properties
new file mode 100644
index 0000000000..288061bb37
--- /dev/null
+++ b/fcli-core/fcli-license/src/main/resources/com/fortify/cli/license/i18n/LicenseMessages.properties
@@ -0,0 +1,61 @@
+# Make sure none of the commands inherit usage header or description of the top-level fcli command
+# Note that we define these as usage.* whereas our parent bundle defines fcli.usage.* (with fcli prefix).
+# For some reason, overriding fcli.usage.* doesn't work.
+usage.header = 
+usage.description = 
+
+# fcli license
+fcli.license.usage.header = License-related commands, like license reporting
+fcli.license.usage.description = This module provides various commands related to Fortify licensing & license reporting. 
+
+# fcli util msp-report
+fcli.license.msp-report.usage.header = Configure and generate 'Managed Service Provider' (MSP) reports.
+fcli.license.msp-report.generate.usage.header = Generate a 'Managed Service Provider' (MSP) report.
+fcli.license.msp-report.generate.usage.description.0 = This command generates a 'Managed Service Provider' (MSP) report based on configuration settings defined in a configuration file. A sample configuration file can be generated using the 'fcli util msp-report generate-config' command.
+fcli.license.msp-report.generate.usage.description.1 = \nThe configuration file includes settings for specifying one or more SSC instances from which to load MSP reporting data, and for specifying MSP (contract) information.
+fcli.license.msp-report.generate.usage.description.2 = \nThe generated report consists of multiple files, written to either a directory or zip-file. The primary output file is 'summary.txt' that contains various statistics, including the number of application and scan entitlements consumed during the reporting period. Various CSV files providing proof, like the number of entitlements consumed per application, what artifacts were processed, and which artifacts contributed to the entitlement consumption, are generated in the details directory of the report.
+fcli.license.msp-report.generate.usage.description.3 = \nThe generated 'checksums.sha256' file can be used to verify integrity of all generated files, using a command like 'sha256sum -c checksums.sha256'.
+fcli.license.msp-report.generate.usage.description.4 = \nThis command requires the following SSC application version attributes to be configured in SSC:
+fcli.license.msp-report.generate.usage.description.5 = - MSP_License_Type: Required, Single-Select List, Values: Application, Scan, Demo 
+fcli.license.msp-report.generate.usage.description.6 = - MSP_End_Customer_Name - Optional (for demo applications), Single Line Text
+fcli.license.msp-report.generate.usage.description.7 = - MSP_End_Customer_Location - Optional (for demo applications), Single Line Text
+fcli.license.msp-report.generate.usage.description.8 = \nNote that all versions within a single application should provide the same values for these attributes.
+fcli.license.msp-report.generate.config = Configuration file; sample can be generated using the 'generate-config' command.
+fcli.license.msp-report.generate.start-date = Reporting period start date. Format: yyyy-MM-dd, for example 2023-01-01.
+fcli.license.msp-report.generate.end-date = Reporting period start date. Format: yyyy-MM-dd, for example 2023-03-31.
+fcli.license.msp-report.generate.confirm = Confirm delete of existing report output location.
+fcli.license.msp-report.generate.confirmPrompt = Confirm delete of existing output location %s?
+fcli.license.msp-report.generate.processing.app = Processing application %s
+fcli.license.msp-report.generate.processing.appversion = Processing application version %s
+fcli.license.msp-report.generate.warn.usingUploadDate = WARN: No scan date found for artifact id %s (%s), using upload date instead
+fcli.license.msp-report.generate-config.usage.header = Generate a sample configuration file for use by the 'generate' command.
+fcli.license.msp-report.generate-config.config = Name of the sample configuration file to be generated.
+fcli.license.msp-report.generate-config.confirm = Confirm overwrite of existing configuration file.
+
+# fcli util ncd-report
+fcli.license.ncd-report.usage.header = Configure and generate 'Number of Contributing Developers' (NCD) reports.
+fcli.license.ncd-report.generate.usage.header = Generate a 'Number of Contributing Developers' (NCD) report.
+fcli.license.ncd-report.generate.usage.description.0 = This command generates a 'Number of Contributing Developers' (NCD) report based on configuration settings defined in a configuration file. A sample configuration file can be generated using the 'fcli util ncd-report generate-config' command.\n
+fcli.license.ncd-report.generate.usage.description.1 = The configuration file includes rich settings for specifying the source code repositories from which to load contributing developer data (supporting multiple Source Code Management (SCM) systems), and for ignoring and de-duplicating contributing authors. \n
+fcli.license.ncd-report.generate.usage.description.2 = The generated report consists of multiple files, written to either a directory or zip-file. The primary output file is 'summary.txt' that contains various statistics, including the de-duplicated count of contributing developers. Various CSV files are generated with supporting proof, like the list of contributing authors, the list of commits that have been processed, and the list of repositories that have been processed.\n 
+fcli.license.ncd-report.generate.usage.description.3 = The generated 'checksums.sha256' file can be used to verify integrity of all generated files, using a command like 'sha256sum -c checksums.sha256'.
+fcli.license.ncd-report.generate.config = Configuration file; sample can be generated using the 'generate-config' command.
+fcli.license.ncd-report.generate.confirm = Confirm delete of existing report output location.
+fcli.license.ncd-report.generate.confirmPrompt = Confirm delete of existing output location %s?
+fcli.license.ncd-report.generate-config.usage.header = Generate a sample configuration file for use by the 'generate' command.
+fcli.license.ncd-report.generate-config.config = Name of the sample configuration file to be generated.
+fcli.license.ncd-report.generate-config.confirm = Confirm overwrite of existing configuration file.
+fcli.license.ncd-report.loading.commits = Loading commits for repository: %s
+fcli.license.ncd-report.loading.branch-commits = Loading commits for branch %s:%s
+fcli.license.ncd-report.loading.github-repositories = Loading repositories for GitHub organization: %s
+fcli.license.ncd-report.loading.gitlab-repositories = Loading repositories for GitLab group: %s
+
+#################################################################################################################
+# The following are technical properties that shouldn't be internationalized ####################################
+#################################################################################################################
+fcli.license.msp-report.generate.output.table.options = reportPath,summary.errorCount
+fcli.license.msp-report.generate-config.output.table.options = path
+fcli.license.ncd-report.generate.output.table.options = reportPath,summary.errorCount
+fcli.license.ncd-report.generate-config.output.table.options = path
+
+
diff --git a/fcli-core/fcli-util/src/test/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java b/fcli-core/fcli-license/src/test/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java
similarity index 91%
rename from fcli-core/fcli-util/src/test/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java
rename to fcli-core/fcli-license/src/test/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java
index 30f58da3aa..d5a3ff32d5 100644
--- a/fcli-core/fcli-util/src/test/java/com/fortify/cli/util/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java
+++ b/fcli-core/fcli-license/src/test/java/com/fortify/cli/license/ncd_report/collector/NcdReportAuthorDeduplicatorTest.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.util.ncd_report.collector;
+package com.fortify.cli.license.ncd_report.collector;
 
 import java.util.Map;
 import java.util.Optional;
@@ -21,10 +21,10 @@
 import org.junit.jupiter.api.Test;
 
 import com.fortify.cli.common.json.JsonHelper;
-import com.fortify.cli.util.ncd_report.config.NcdReportContributorConfig;
-import com.fortify.cli.util.ncd_report.descriptor.INcdReportAuthorDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
-import com.fortify.cli.util.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor.NcdReportProcessedAuthorState;
+import com.fortify.cli.license.ncd_report.config.NcdReportContributorConfig;
+import com.fortify.cli.license.ncd_report.descriptor.INcdReportAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor;
+import com.fortify.cli.license.ncd_report.descriptor.NcdReportProcessedAuthorDescriptor.NcdReportProcessedAuthorState;
 
 import lombok.Data;
 import lombok.RequiredArgsConstructor;
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java
index 0093895345..22361f43cf 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_common/session/cli/cmd/SCDastSessionCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_dast._common.session.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -24,5 +24,5 @@
                 SCDastSessionLogoutCommand.class 
         }
 )
-public class SCDastSessionCommands extends AbstractFortifyCLICommand {
+public class SCDastSessionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java
index 5a2b084d6e..1179ecb2f5 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/_main/cli/cmd/SCDastCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_dast._main.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.sc_dast._common.session.cli.cmd.SCDastSessionCommands;
 import com.fortify.cli.sc_dast.rest.cli.cmd.SCDastRestCommands;
 import com.fortify.cli.sc_dast.scan.cli.cmd.SCDastScanCommands;
@@ -42,4 +42,4 @@
                 SCDastRestCommands.class,
         }
 )
-public class SCDastCommands extends AbstractFortifyCLICommand {}
+public class SCDastCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java
index 7957b6e892..07245abf32 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/rest/cli/cmd/SCDastRestCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_dast.rest.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,5 +23,5 @@
         }
 
 )
-public class SCDastRestCommands extends AbstractFortifyCLICommand {
+public class SCDastRestCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java
index 8fc484e2f9..940b7ac852 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan/cli/cmd/SCDastScanCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_dast.scan.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 import com.fortify.cli.sc_dast.scan.cli.cmd.action.SCDastScanCompleteCommand;
 import com.fortify.cli.sc_dast.scan.cli.cmd.action.SCDastScanDeleteCommand;
@@ -40,5 +40,5 @@
         }
 )
 @DefaultVariablePropertyName("id")
-public class SCDastScanCommands extends AbstractFortifyCLICommand {
+public class SCDastScanCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java
index 3f932c83cf..cd467e8ce3 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_policy/cli/cmd/SCDastScanPolicyCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_dast.scan_policy.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine.Command;
@@ -25,5 +25,5 @@
         }
 )
 @DefaultVariablePropertyName("id")
-public class SCDastScanPolicyCommands extends AbstractFortifyCLICommand {
+public class SCDastScanPolicyCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java
index 2116a70bdb..dba877ce7e 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/scan_settings/cli/cmd/SCDastScanSettingsCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_dast.scan_settings.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine.Command;
@@ -25,5 +25,5 @@
         }
 )
 @DefaultVariablePropertyName("id")
-public class SCDastScanSettingsCommands extends AbstractFortifyCLICommand {
+public class SCDastScanSettingsCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java
index 5d00866718..62273a8538 100644
--- a/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java
+++ b/fcli-core/fcli-sc-dast/src/main/java/com/fortify/cli/sc_dast/sensor/cli/cmd/SCDastSensorCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_dast.sensor.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine.Command;
@@ -27,5 +27,5 @@
         }
 )
 @DefaultVariablePropertyName("id")
-public class SCDastSensorCommands extends AbstractFortifyCLICommand {
+public class SCDastSensorCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties b/fcli-core/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties
index 7a1c164812..5d5dc30dbb 100644
--- a/fcli-core/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties
+++ b/fcli-core/fcli-sc-dast/src/main/resources/com/fortify/cli/sc_dast/i18n/SCDastMessages.properties
@@ -83,11 +83,17 @@ fcli.sc-dast.session.logout.no-revoke-token = Don't revoke the token passed to o
 
 # fcli sc-dast session list
 fcli.sc-dast.session.list.usage.header = List active and expired ScanCentral DAST sessions.
-fcli.sc-dast.session.list.usage.description = This commands lists all ScanCentral DAST sessions created \
-  through the `login` command, as long as they haven't been explicitly terminated through the 'logout' \
-  command. For sessions created using user name and password, the output of this command will show \
-  session expiry date and status. For sessions created using a pre-generated token, fcli cannot display \
-  this information as SSC doesn't allow for obtaining this information.
+fcli.sc-dast.session.list.usage.description.0 = This commands lists all ScanCentral DAST sessions created through the `login` \
+  command, as long as they haven't been explicitly terminated through the 'logout' command. %n
+fcli.sc-dast.session.list.usage.description.1 = For sessions created using user name and password, the output \
+  of this command will show session expiry date and status, based on the data provided by SSC at the time \
+  the login command was issued. Any changes to the generated token will not be reflected in the output of \
+  this command. Even if a session is no longer valid because the generated token was revoked (through SSC \
+  UI or 'fcli ssc token revoke' command), the output of this command may still show the session as not having \
+  expired. Similarly, any changes to token validity will not be reflected in the output of this command. %n
+fcli.sc-dast.session.list.usage.description.2 = For sessions created using a pre-generated token, fcli cannot \
+  display session expiration date or status, as SSC doesn't allow for obtaining this information.
+
 
 # fcli sc-dast rest
 fcli.sc-dast.rest.usage.header = Interact with ScanCentral DAST REST API endpoints.
diff --git a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java
index 986be1a7a5..da39b50217 100644
--- a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java
+++ b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_common/session/cli/cmd/SCSastSessionCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_sast._common.session.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -24,5 +24,5 @@
                 SCSastSessionLogoutCommand.class 
         }
 )
-public class SCSastSessionCommands extends AbstractFortifyCLICommand {
+public class SCSastSessionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java
index d0445fa826..714c1dc87c 100644
--- a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java
+++ b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/_main/cli/cmd/SCSastCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_sast._main.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.sc_sast._common.session.cli.cmd.SCSastSessionCommands;
 import com.fortify.cli.sc_sast.rest.cli.cmd.SCSastControllerRestCommands;
 import com.fortify.cli.sc_sast.scan.cli.cmd.SCSastScanCommands;
@@ -36,4 +36,4 @@
                 SCSastControllerRestCommands.class,
         }
 )
-public class SCSastCommands extends AbstractFortifyCLICommand {}
+public class SCSastCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java
index 6eaab5ab1d..48638f0db6 100644
--- a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java
+++ b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/rest/cli/cmd/SCSastControllerRestCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_sast.rest.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,5 +23,5 @@
         }
 
 )
-public class SCSastControllerRestCommands extends AbstractFortifyCLICommand {
+public class SCSastControllerRestCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java
index 13729ea36d..1aa2385fca 100644
--- a/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java
+++ b/fcli-core/fcli-sc-sast/src/main/java/com/fortify/cli/sc_sast/scan/cli/cmd/SCSastScanCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.sc_sast.scan.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine.Command;
@@ -27,5 +27,5 @@
         }
 )
 @DefaultVariablePropertyName("jobToken")
-public class SCSastScanCommands extends AbstractFortifyCLICommand {
+public class SCSastScanCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties b/fcli-core/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties
index 529845e294..b8d8b5c344 100644
--- a/fcli-core/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties
+++ b/fcli-core/fcli-sc-sast/src/main/resources/com/fortify/cli/sc_sast/i18n/SCSastMessages.properties
@@ -86,11 +86,16 @@ fcli.sc-sast.session.logout.no-revoke-token = Don't revoke the token passed to o
 
 # fcli sc-sast session list
 fcli.sc-sast.session.list.usage.header = List active and expired ScanCentral SAST sessions.
-fcli.sc-sast.session.list.usage.description = This commands lists all ScanCentral SAST sessions created \
-  through the `login` command, as long as they haven't been explicitly terminated through the 'logout' \
-  command. For sessions created using user name and password, the output of this command will show \
-  session expiry date and status. For sessions created using a pre-generated token, fcli cannot display \
-  this information as SSC doesn't allow for obtaining this information.
+fcli.sc-sast.session.list.usage.description.0 = This commands lists all ScanCentral SAST sessions created through the `login` \
+  command, as long as they haven't been explicitly terminated through the 'logout' command. %n
+fcli.sc-sast.session.list.usage.description.1 = For sessions created using user name and password, the output \
+  of this command will show session expiry date and status, based on the data provided by SSC at the time \
+  the login command was issued. Any changes to the generated token will not be reflected in the output of \
+  this command. Even if a session is no longer valid because the generated token was revoked (through SSC \
+  UI or 'fcli ssc token revoke' command), the output of this command may still show the session as not having \
+  expired. Similarly, any changes to token validity will not be reflected in the output of this command. %n
+fcli.sc-sast.session.list.usage.description.2 = For sessions created using a pre-generated token, fcli cannot \
+  display session expiration date or status, as SSC doesn't allow for obtaining this information.
 
 # fcli sc-sast rest
 fcli.sc-sast.rest.usage.header = Interact with ScanCentral SAST Controller REST API endpoints.
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java
index 46eb0faa33..06e3f72d20 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_common/session/cli/cmd/SSCSessionCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc._common.session.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -24,5 +24,5 @@
                 SSCSessionLogoutCommand.class 
         }
 )
-public class SSCSessionCommands extends AbstractFortifyCLICommand {
+public class SSCSessionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java
index 51ccc8564d..565bab71e9 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/_main/cli/cmd/SSCCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc._main.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.ssc._common.session.cli.cmd.SSCSessionCommands;
 import com.fortify.cli.ssc.activity_feed.cli.cmd.SSCActivityFeedCommands;
 import com.fortify.cli.ssc.alert.cli.cmd.SSCAlertCommands;
@@ -78,4 +78,4 @@
                 SSCRestCommands.class,
         }
 )
-public class SSCCommands extends AbstractFortifyCLICommand {}
+public class SSCCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java
index b8ee67beaa..a5e966bf18 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/activity_feed/cli/cmd/SSCActivityFeedCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.activity_feed.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -22,5 +22,5 @@
                 SSCActivityFeedListCommand.class
         }
 )
-public class SSCActivityFeedCommands extends AbstractFortifyCLICommand {
+public class SSCActivityFeedCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java
index 32045516fc..1a25511e00 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert/cli/cmd/SSCAlertCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.alert.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -22,5 +22,5 @@
                 SSCAlertListCommand.class
         }
 )
-public class SSCAlertCommands extends AbstractFortifyCLICommand {
+public class SSCAlertCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java
index d8cba61c84..5f9305b9f2 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/alert_definition/cli/cmd/SSCAlertDefinitionCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.alert_definition.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,5 +23,5 @@
                 SSCAlertDefinitionListCommand.class
         }
 )
-public class SSCAlertDefinitionCommands extends AbstractFortifyCLICommand {
+public class SSCAlertDefinitionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java
index ab8e4d6627..e20b766da1 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/app/cli/cmd/SSCAppCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.app.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine.Command;
@@ -27,5 +27,5 @@
         }
 )
 @DefaultVariablePropertyName("id")
-public class SSCAppCommands extends AbstractFortifyCLICommand {
+public class SSCAppCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java
index 70b2799841..9ff41efd96 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion/cli/cmd/SSCAppVersionCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.appversion.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 
 import picocli.CommandLine.Command;
@@ -31,5 +31,5 @@
         }
 )
 @DefaultVariablePropertyName("id")
-public class SSCAppVersionCommands extends AbstractFortifyCLICommand {
+public class SSCAppVersionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java
index fa1e6b0697..1a426dcfcd 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_attribute/cli/cmd/SSCAppVersionAttributeCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.appversion_attribute.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,5 +23,5 @@
             SSCAppVersionAttributeSetCommand.class
         }
 )
-public class SSCAppVersionAttributeCommands extends AbstractFortifyCLICommand {
+public class SSCAppVersionAttributeCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java
index 838ad8dbe2..7a969e496d 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_filterset/cli/cmd/SSCAppVersionFilterSetCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.appversion_filterset.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,5 +23,5 @@
             SSCAppVersionFilterSetListCommand.class,
         }
 )
-public class SSCAppVersionFilterSetCommands extends AbstractFortifyCLICommand {
+public class SSCAppVersionFilterSetCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionUserCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionUserCommands.java
index f06375de1c..a7a56bb36b 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionUserCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/appversion_user/cli/cmd/SSCAppVersionUserCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.appversion_user.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -24,5 +24,5 @@
                 SSCAppVersionUserListCommand.class,
         }
 )
-public class SSCAppVersionUserCommands extends AbstractFortifyCLICommand {
+public class SSCAppVersionUserCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/artifact/cli/cmd/SSCArtifactCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/artifact/cli/cmd/SSCArtifactCommands.java
index 6c5f1a2a7e..0bace39b68 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/artifact/cli/cmd/SSCArtifactCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/artifact/cli/cmd/SSCArtifactCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.artifact.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.common.variable.DefaultVariablePropertyName;
 import com.fortify.cli.ssc.artifact.cli.cmd.import_debricked.SSCArtifactImportDebrickedCommand;
 
@@ -33,5 +33,5 @@
         }
 )
 @DefaultVariablePropertyName("id")
-public class SSCArtifactCommands extends AbstractFortifyCLICommand {
+public class SSCArtifactCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java
index eadc78d645..17e364ac4d 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/attribute_definition/cli/cmd/SSCAttributeDefinitionCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.attribute_definition.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,5 +23,5 @@
             SSCAttributeDefinitionListCommand.class
         }
 )
-public class SSCAttributeDefinitionCommands extends AbstractFortifyCLICommand {
+public class SSCAttributeDefinitionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java
index 835c370f52..f61f833bb6 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/event/cli/cmd/SSCEventCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.event.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -22,5 +22,5 @@
                 SSCEventListCommand.class
         }
 )
-public class SSCEventCommands extends AbstractFortifyCLICommand {
+public class SSCEventCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java
index 49dc8816dc..3b7133200a 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/issue_template/cli/cmd/SSCIssueTemplateCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.issue_template.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -27,5 +27,5 @@
                 SSCIssueTemplateUpdateCommand.class
         }
 )
-public class SSCIssueTemplateCommands extends AbstractFortifyCLICommand {
+public class SSCIssueTemplateCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java
index 4531a2b7a3..a265d3f26c 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/job/cli/cmd/SSCJobCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.job.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -25,5 +25,5 @@
                 SSCJobUpdateCommand.class
         }
 )
-public class SSCJobCommands extends AbstractFortifyCLICommand {
+public class SSCJobCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java
index 6e36f8d9f4..dfe880f8a4 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/plugin/cli/cmd/SSCPluginCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.plugin.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -28,5 +28,5 @@
         }
 
 )
-public class SSCPluginCommands extends AbstractFortifyCLICommand {
+public class SSCPluginCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java
index 2ed2e50b3f..18f09ed799 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/report_template/cli/cmd/SSCReportTemplateCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.report_template.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -27,5 +27,5 @@
                 SSCReportTemplateDeleteCommand.class
         }
 )
-public class SSCReportTemplateCommands extends AbstractFortifyCLICommand {
+public class SSCReportTemplateCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java
index c34a548196..cb9828d0f0 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/rest/cli/cmd/SSCRestCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.rest.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,5 +23,5 @@
         }
 
 )
-public class SSCRestCommands extends AbstractFortifyCLICommand {
+public class SSCRestCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java
index b281223422..28cafdd77f 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role/cli/cmd/SSCRoleCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.role.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -26,5 +26,5 @@
         }
 
 )
-public class SSCRoleCommands extends AbstractFortifyCLICommand {
+public class SSCRoleCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java
index 52ca8667d3..56c1e6a492 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/role_permission/cli/cmd/SSCRolePermissionCommands.java
@@ -13,7 +13,7 @@
 
 package com.fortify.cli.ssc.role_permission.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -26,5 +26,5 @@
         }
 
 )
-public class SSCRolePermissionCommands extends AbstractFortifyCLICommand {
+public class SSCRolePermissionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java
index c203d461bb..d0c8e9d614 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/seed_bundle/cli/cmd/SSCSeedBundleCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.seed_bundle.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -22,5 +22,5 @@
                 SSCSeedBundleUploadCommand.class
         }
 )
-public class SSCSeedBundleCommands extends AbstractFortifyCLICommand {
+public class SSCSeedBundleCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java
index d11b63bf85..d2ace886de 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token/cli/cmd/SSCTokenCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.token.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -26,5 +26,5 @@
         }
 
 )
-public class SSCTokenCommands extends AbstractFortifyCLICommand {
+public class SSCTokenCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java
index e918eb1b83..6212b11df3 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/token_definition/cli/cmd/SSCTokenDefinitionCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.token_definition.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,5 +23,5 @@
         }
 
 )
-public class SSCTokenDefinitionCommands extends AbstractFortifyCLICommand {
+public class SSCTokenDefinitionCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCUserCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCUserCommands.java
index 5e644a1d0e..f877d5b8bc 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCUserCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/user/cli/cmd/SSCUserCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.user.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -24,5 +24,5 @@
                 SSCUserListCommand.class
         }
 )
-public class SSCUserCommands extends AbstractFortifyCLICommand {
+public class SSCUserCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/vulnerability/cli/cmd/SSCVulnerabilityCommands.java b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/vulnerability/cli/cmd/SSCVulnerabilityCommands.java
index e88575fb5e..b18177f83f 100644
--- a/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/vulnerability/cli/cmd/SSCVulnerabilityCommands.java
+++ b/fcli-core/fcli-ssc/src/main/java/com/fortify/cli/ssc/vulnerability/cli/cmd/SSCVulnerabilityCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.ssc.vulnerability.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -22,5 +22,5 @@
             SSCVulnerabilityCountCommand.class,
         }
 )
-public class SSCVulnerabilityCommands extends AbstractFortifyCLICommand {
+public class SSCVulnerabilityCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties
index b329485f50..167dce00bd 100644
--- a/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties
+++ b/fcli-core/fcli-ssc/src/main/resources/com/fortify/cli/ssc/i18n/SSCMessages.properties
@@ -98,11 +98,16 @@ fcli.ssc.session.logout.no-revoke-token = Don't revoke the token passed to or ge
   being revoked.
   
 fcli.ssc.session.list.usage.header = List active and expired Fortify SSC sessions.
-fcli.ssc.session.list.usage.description = This commands lists all SSC sessions created through the `login` \
-  command, as long as they haven't been explicitly terminated through the 'logout' command. For sessions \
-  created using user name and password, the output of this command will show session expiry date and status. \
-  For sessions created using a pre-generated token, fcli cannot display this information as SSC doesn't \
-  allow for obtaining this information.
+fcli.ssc.session.list.usage.description.0 = This commands lists all SSC sessions created through the `login` \
+  command, as long as they haven't been explicitly terminated through the 'logout' command. %n
+fcli.ssc.session.list.usage.description.1 = For sessions created using user name and password, the output \
+  of this command will show session expiry date and status, based on the data provided by SSC at the time \
+  the login command was issued. Any changes to the generated token will not be reflected in the output of \
+  this command. Even if a session is no longer valid because the generated token was revoked (through SSC \
+  UI or 'fcli ssc token revoke' command), the output of this command may still show the session as not having \
+  expired. Similarly, any changes to token validity will not be reflected in the output of this command. %n
+fcli.ssc.session.list.usage.description.2 = For sessions created using a pre-generated token, fcli cannot \
+  display session expiration date or status, as SSC doesn't allow for obtaining this information.
 
 # fcli ssc rest
 fcli.ssc.rest.usage.header = Interact with SSC REST API endpoints.
diff --git a/fcli-core/fcli-state/build.gradle b/fcli-core/fcli-state/build.gradle
deleted file mode 100644
index 8e063597b9..0000000000
--- a/fcli-core/fcli-state/build.gradle
+++ /dev/null
@@ -1 +0,0 @@
-apply from: "${sharedGradleScriptsDir}/fcli-module.gradle"
\ No newline at end of file
diff --git a/fcli-core/fcli-state/src/main/resources/com/fortify/cli/state/i18n/StateMessages.properties b/fcli-core/fcli-state/src/main/resources/com/fortify/cli/state/i18n/StateMessages.properties
deleted file mode 100644
index ac3de539bc..0000000000
--- a/fcli-core/fcli-state/src/main/resources/com/fortify/cli/state/i18n/StateMessages.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-# Make sure none of the commands inherit usage header or description of the top-level fcli command
-# Note that we define these as usage.* whereas our parent bundle defines fcli.usage.* (with fcli prefix).
-# For some reason, overriding fcli.usage.* doesn't work.
-usage.header = 
-usage.description = 
-
-# fcli state
-fcli.state.usage.header = Manage fcli state data.
-fcli.state.usage.description = The commands in this module allow for managing fcli state, like managing fcli variable data. 
-
-# fcli state clear
-fcli.state.clear.usage.header = Clear all fcli state data.
-fcli.state.clear.usage.description = This command deletes all state data from the fcli data directory. This includes variable data and session data. As a best practice, you should log out of existing sessions before running this command to perform proper session cleanup. This command does not clear fcli configuration data; please use the 'fcli config clear' command for clearing configuration data. 
-fcli.state.clear.confirm = Confirm deleting all fcli state.
-
-# fcli state variable
-fcli.state.variable.usage.header = Manage fcli variables.
-fcli.state.variable.clear.usage.header = Clear all fcli variables.
-fcli.state.variable.delete.usage.header = Delete a single fcli variable.
-fcli.state.variable.get.usage.header = Get fcli variable meta-data.
-fcli.state.variable.list.usage.header = List fcli variables.
-fcli.state.variable.contents.usage.header = Get fcli variable contents.
-fcli.state.variable.name = Variable name.
-
-#################################################################################################################
-# The following are technical properties that shouldn't be internationalized ####################################
-#################################################################################################################
-
-# Table output columns configuration
-fcli.state.clear.output.table.options = name,type
-# Empty on purpose; output columns depend on variable contents, so we don't want default variable columns
-fcli.state.variable.contents.output.table.options = 
-fcli.state.variable.output.table.options = created,accessed,name,defaultPropertyName,singular,encrypted
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java
index 215835fc66..0875dc4285 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/_main/cli/cmd/ToolCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.tool._main.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.tool.fod_uploader.cli.cmd.ToolFoDUploaderCommands;
 import com.fortify.cli.tool.sc_client.cli.cmd.ToolSCClientCommands;
 import com.fortify.cli.tool.vuln_exporter.cli.cmd.ToolVulnExporterCommands;
@@ -28,4 +28,4 @@
             ToolVulnExporterCommands.class
         }
 )
-public class ToolCommands extends AbstractFortifyCLICommand {}
+public class ToolCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java
index 904c982b1d..130742f2b3 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/fod_uploader/cli/cmd/ToolFoDUploaderCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.tool.fod_uploader.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -26,6 +26,6 @@
         }
 
 )
-public class ToolFoDUploaderCommands extends AbstractFortifyCLICommand {
+public class ToolFoDUploaderCommands extends AbstractContainerCommand {
     static final String TOOL_NAME = "fod-uploader";
 }
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java
index ab107a1cfe..36427d50f0 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/sc_client/cli/cmd/ToolSCClientCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.tool.sc_client.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -26,6 +26,6 @@
         }
 
 )
-public class ToolSCClientCommands extends AbstractFortifyCLICommand {
+public class ToolSCClientCommands extends AbstractContainerCommand {
     static final String TOOL_NAME = "sc-client";
 }
\ No newline at end of file
diff --git a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java
index be27443f2f..c1abeb351b 100644
--- a/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java
+++ b/fcli-core/fcli-tool/src/main/java/com/fortify/cli/tool/vuln_exporter/cli/cmd/ToolVulnExporterCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.tool.vuln_exporter.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -26,6 +26,6 @@
         }
 
 )
-public class ToolVulnExporterCommands extends AbstractFortifyCLICommand {
+public class ToolVulnExporterCommands extends AbstractContainerCommand {
     static final String TOOL_NAME = "vuln-exporter";
 }
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java
index ac6dc0658f..c18463ced7 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/_main/cli/cmd/UtilCommands.java
@@ -12,13 +12,13 @@
  *******************************************************************************/
 package com.fortify.cli.util._main.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 import com.fortify.cli.util.all_commands.cli.cmd.AllCommandsCommands;
 import com.fortify.cli.util.autocomplete.cli.cmd.AutoCompleteCommands;
 import com.fortify.cli.util.crypto.cli.cmd.CryptoCommands;
-import com.fortify.cli.util.msp_report.cli.cmd.MspReportCommands;
-import com.fortify.cli.util.ncd_report.cli.cmd.NcdReportCommands;
 import com.fortify.cli.util.sample_data.cli.cmd.SampleDataCommands;
+import com.fortify.cli.util.state.cli.cmd.StateCommands;
+import com.fortify.cli.util.variable.cli.cmd.VariableCommands;
 
 import picocli.CommandLine.Command;
 
@@ -29,9 +29,9 @@
             AllCommandsCommands.class,
             AutoCompleteCommands.class,
             CryptoCommands.class,
-            MspReportCommands.class,
-            NcdReportCommands.class,
-            SampleDataCommands.class
+            SampleDataCommands.class,
+            StateCommands.class,
+            VariableCommands.class
         }
 )
-public class UtilCommands extends AbstractFortifyCLICommand {}
+public class UtilCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java
index 52d4495b89..1b9dc39726 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.util.all_commands.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,4 +23,4 @@
             AllCommandsListCommand.class
         }
 )
-public class AllCommandsCommands extends AbstractFortifyCLICommand {}
+public class AllCommandsCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java
index 13e4e0c24c..16250767f5 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/all_commands/cli/cmd/AllCommandsUsageCommand.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.util.all_commands.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
 import com.fortify.cli.util.all_commands.cli.mixin.AllCommandsCommandSelectorMixin;
 
 import picocli.CommandLine;
@@ -21,7 +21,7 @@
 import picocli.CommandLine.Model.CommandSpec;
 
 @Command(name = "usage")
-public final class AllCommandsUsageCommand extends AbstractFortifyCLICommand implements Runnable {
+public final class AllCommandsUsageCommand extends AbstractRunnableCommand implements Runnable {
     @Mixin private AllCommandsCommandSelectorMixin selectorMixin;
     
     @Override
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java
index 857155390d..853e40cd3e 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.util.autocomplete.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -22,4 +22,4 @@
             AutoCompleteGenerationCommand.class
         }
 )
-public class AutoCompleteCommands extends AbstractFortifyCLICommand {}
+public class AutoCompleteCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java
index 18b6dcd5d9..206238d21d 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/autocomplete/cli/cmd/AutoCompleteGenerationCommand.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.util.autocomplete.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
 
 import picocli.AutoComplete;
 import picocli.CommandLine.Command;
@@ -27,7 +27,7 @@
  * 
  */
 @Command(name = "generate")
-public final class AutoCompleteGenerationCommand extends AbstractFortifyCLICommand implements Runnable {
+public final class AutoCompleteGenerationCommand extends AbstractRunnableCommand implements Runnable {
     @Spec CommandSpec spec;
 
     public void run() {
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java
index d16220c03f..b7f72bf26d 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/AbstractCryptoCommand.java
@@ -14,13 +14,13 @@
 
 import java.util.Scanner;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractRunnableCommand;
 import com.fortify.cli.common.cli.mixin.CommandHelperMixin;
 
 import lombok.SneakyThrows;
 import picocli.CommandLine.Mixin;
 
-public abstract class AbstractCryptoCommand extends AbstractFortifyCLICommand implements Runnable {
+public abstract class AbstractCryptoCommand extends AbstractRunnableCommand implements Runnable {
     @Mixin private CommandHelperMixin commandHelper;
     
     @Override @SneakyThrows
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java
index a58c739860..1741a6aef6 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/crypto/cli/cmd/CryptoCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.util.crypto.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -23,4 +23,4 @@
             CryptoDecryptCommand.class
         }
 )
-public class CryptoCommands extends AbstractFortifyCLICommand {}
+public class CryptoCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java
index ad817ead1b..4503f99768 100644
--- a/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/sample_data/cli/cmd/SampleDataCommands.java
@@ -12,7 +12,7 @@
  *******************************************************************************/
 package com.fortify.cli.util.sample_data.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -24,4 +24,4 @@
                 SampleDataListCommand.class
         }
 )
-public class SampleDataCommands extends AbstractFortifyCLICommand {}
+public class SampleDataCommands extends AbstractContainerCommand {}
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateClearCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateClearCommand.java
similarity index 98%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateClearCommand.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateClearCommand.java
index 5b09edbfd2..bb167b5546 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/StateClearCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateClearCommand.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state._main.cli.cmd;
+package com.fortify.cli.util.state.cli.cmd;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/package-info.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateCommands.java
similarity index 68%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/package-info.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateCommands.java
index b3f57c1a75..d2ebcdfb9d 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/_main/cli/cmd/package-info.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/state/cli/cmd/StateCommands.java
@@ -10,9 +10,17 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-/**
- * This package defines the 'state' top-level command, some generic sub-commands, and any accompanying 
- * classes like mixins and (abstract) base classes.
- */
-package com.fortify.cli.state._main.cli.cmd;
+package com.fortify.cli.util.state.cli.cmd;
 
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
+
+import picocli.CommandLine.Command;
+
+@Command(
+        name = "state",
+        subcommands = {
+            StateClearCommand.class,
+        }
+)
+public class StateCommands extends AbstractContainerCommand {
+}
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableClearCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableClearCommand.java
similarity index 97%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableClearCommand.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableClearCommand.java
index 1c0f553bc2..c17c8b312a 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableClearCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableClearCommand.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state.variable.cli.cmd;
+package com.fortify.cli.util.variable.cli.cmd;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.output.cli.cmd.AbstractOutputCommand;
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableCommands.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableCommands.java
similarity index 85%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableCommands.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableCommands.java
index 400ffe189b..c52afc91dd 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableCommands.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableCommands.java
@@ -10,9 +10,9 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state.variable.cli.cmd;
+package com.fortify.cli.util.variable.cli.cmd;
 
-import com.fortify.cli.common.cli.cmd.AbstractFortifyCLICommand;
+import com.fortify.cli.common.cli.cmd.AbstractContainerCommand;
 
 import picocli.CommandLine.Command;
 
@@ -28,5 +28,5 @@
                 
         }
 )
-public class VariableCommands extends AbstractFortifyCLICommand {
+public class VariableCommands extends AbstractContainerCommand {
 }
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableContentsCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableContentsCommand.java
similarity index 89%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableContentsCommand.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableContentsCommand.java
index 41e27fa319..57af6b4090 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableContentsCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableContentsCommand.java
@@ -10,15 +10,15 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state.variable.cli.cmd;
+package com.fortify.cli.util.variable.cli.cmd;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.output.cli.cmd.AbstractOutputCommand;
 import com.fortify.cli.common.output.cli.cmd.IJsonNodeSupplier;
 import com.fortify.cli.common.util.DisableTest;
 import com.fortify.cli.common.util.DisableTest.TestType;
-import com.fortify.cli.state.variable.cli.mixin.VariableOutputHelperMixins;
-import com.fortify.cli.state.variable.cli.mixin.VariableResolverMixin;
+import com.fortify.cli.util.variable.cli.mixin.VariableOutputHelperMixins;
+import com.fortify.cli.util.variable.cli.mixin.VariableResolverMixin;
 
 import lombok.Getter;
 import picocli.CommandLine.Command;
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableDeleteCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableDeleteCommand.java
similarity index 94%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableDeleteCommand.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableDeleteCommand.java
index e4e3acd326..33f1464cb5 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableDeleteCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableDeleteCommand.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state.variable.cli.cmd;
+package com.fortify.cli.util.variable.cli.cmd;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.output.cli.cmd.AbstractOutputCommand;
@@ -18,7 +18,7 @@
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
 import com.fortify.cli.common.output.transform.IActionCommandResultSupplier;
 import com.fortify.cli.common.variable.FcliVariableHelper;
-import com.fortify.cli.state.variable.cli.mixin.VariableResolverMixin;
+import com.fortify.cli.util.variable.cli.mixin.VariableResolverMixin;
 
 import lombok.Getter;
 import picocli.CommandLine.Command;
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableGetCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableGetCommand.java
similarity index 92%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableGetCommand.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableGetCommand.java
index bbce5ba7aa..bb2103a1cb 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableGetCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableGetCommand.java
@@ -10,13 +10,13 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state.variable.cli.cmd;
+package com.fortify.cli.util.variable.cli.cmd;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.output.cli.cmd.AbstractOutputCommand;
 import com.fortify.cli.common.output.cli.cmd.IJsonNodeSupplier;
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
-import com.fortify.cli.state.variable.cli.mixin.VariableResolverMixin;
+import com.fortify.cli.util.variable.cli.mixin.VariableResolverMixin;
 
 import lombok.Getter;
 import picocli.CommandLine.Command;
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableListCommand.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableListCommand.java
similarity index 96%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableListCommand.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableListCommand.java
index 85901f6a03..3bf1fc84d5 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/cmd/VariableListCommand.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/cmd/VariableListCommand.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state.variable.cli.cmd;
+package com.fortify.cli.util.variable.cli.cmd;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.output.cli.cmd.AbstractOutputCommand;
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableOutputHelperMixins.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/mixin/VariableOutputHelperMixins.java
similarity index 94%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableOutputHelperMixins.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/mixin/VariableOutputHelperMixins.java
index 6572a91353..7d7c345915 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableOutputHelperMixins.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/mixin/VariableOutputHelperMixins.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state.variable.cli.mixin;
+package com.fortify.cli.util.variable.cli.mixin;
 
 import com.fortify.cli.common.output.cli.mixin.OutputHelperMixins;
 
diff --git a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableResolverMixin.java b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/mixin/VariableResolverMixin.java
similarity index 95%
rename from fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableResolverMixin.java
rename to fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/mixin/VariableResolverMixin.java
index aa782f3c89..0cc684df77 100644
--- a/fcli-core/fcli-state/src/main/java/com/fortify/cli/state/variable/cli/mixin/VariableResolverMixin.java
+++ b/fcli-core/fcli-util/src/main/java/com/fortify/cli/util/variable/cli/mixin/VariableResolverMixin.java
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  *******************************************************************************/
-package com.fortify.cli.state.variable.cli.mixin;
+package com.fortify.cli.util.variable.cli.mixin;
 
 import com.fasterxml.jackson.databind.JsonNode;
 import com.fortify.cli.common.variable.FcliVariableHelper;
@@ -39,7 +39,7 @@ public static abstract class AbstractRequiredVariableResolverMixin extends Abstr
     }
     
     public static class PositionalParameter extends AbstractRequiredVariableResolverMixin {
-        @Parameters(index = "0", arity = "1", descriptionKey = "fcli.state.variable.name")
+        @Parameters(index = "0", arity = "1", descriptionKey = "fcli.util.variable.name")
         @Getter private String variableName;
     }
 }
diff --git a/fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties b/fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties
index 5f9743a6fc..a041391dff 100644
--- a/fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties
+++ b/fcli-core/fcli-util/src/main/resources/com/fortify/cli/util/i18n/UtilMessages.properties
@@ -39,7 +39,7 @@ fcli.util.auto-complete.generate.usage.description.1 = Run the following command
 fcli.util.auto-complete.generate.usage.description.2 = \u0020\u0020source <(${PARENT-COMMAND-FULL-NAME:-$PARENTCOMMAND} ${COMMAND-NAME})
 
 # fcli util crypto
-fcli.util.crypto.usage.header = Encrypting and decrypting data
+fcli.util.crypto.usage.header = Encrypt and decrypt data.
 fcli.util.crypto.usage.description.0 = These commands allow for encrypting and decrypting string values using fcli built-in encryption mechanism and password. The password can be customized through the FCLI_ENCRYPT_KEY environment variable, obviously the same password should be configured during encryption and decryption.
 fcli.util.crypto.usage.description.1 = Note that for now, encryption and decryption is not compatible with Fortify's pwtool utility. These commands are mainly meant to allow encrypted passwords to be stored in fcli configuration files, for example as used by the 'fcli util msp-report' and 'fcli util ncd-report' commands.
 fcli.util.crypto.encrypt.usage.header = Encrypt a value.
@@ -47,48 +47,6 @@ fcli.util.crypto.encrypt.prompt = Value to encrypt:
 fcli.util.crypto.decrypt.usage.header = Decrypt a value.
 fcli.util.crypto.decrypt.prompt = Value to decrypt:
 
-# fcli util msp-report
-fcli.util.msp-report.usage.header = Configure and generate 'Managed Service Provider' (MSP) reports.
-fcli.util.msp-report.generate.usage.header = Generate a 'Managed Service Provider' (MSP) report.
-fcli.util.msp-report.generate.usage.description.0 = This command generates a 'Managed Service Provider' (MSP) report based on configuration settings defined in a configuration file. A sample configuration file can be generated using the 'fcli util msp-report generate-config' command.
-fcli.util.msp-report.generate.usage.description.1 = \nThe configuration file includes settings for specifying one or more SSC instances from which to load MSP reporting data, and for specifying MSP (contract) information.
-fcli.util.msp-report.generate.usage.description.2 = \nThe generated report consists of multiple files, written to either a directory or zip-file. The primary output file is 'summary.txt' that contains various statistics, including the number of application and scan entitlements consumed during the reporting period. Various CSV files providing proof, like the number of entitlements consumed per application, what artifacts were processed, and which artifacts contributed to the entitlement consumption, are generated in the details directory of the report.
-fcli.util.msp-report.generate.usage.description.3 = \nThe generated 'checksums.sha256' file can be used to verify integrity of all generated files, using a command like 'sha256sum -c checksums.sha256'.
-fcli.util.msp-report.generate.usage.description.4 = \nThis command requires the following SSC application version attributes to be configured in SSC:
-fcli.util.msp-report.generate.usage.description.5 = - MSP_License_Type: Required, Single-Select List, Values: Application, Scan, Demo 
-fcli.util.msp-report.generate.usage.description.6 = - MSP_End_Customer_Name - Optional (for demo applications), Single Line Text
-fcli.util.msp-report.generate.usage.description.7 = - MSP_End_Customer_Location - Optional (for demo applications), Single Line Text
-fcli.util.msp-report.generate.usage.description.8 = \nNote that all versions within a single application should provide the same values for these attributes.
-fcli.util.msp-report.generate.config = Configuration file; sample can be generated using the 'generate-config' command.
-fcli.util.msp-report.generate.start-date = Reporting period start date. Format: yyyy-MM-dd, for example 2023-01-01.
-fcli.util.msp-report.generate.end-date = Reporting period start date. Format: yyyy-MM-dd, for example 2023-03-31.
-fcli.util.msp-report.generate.confirm = Confirm delete of existing report output location.
-fcli.util.msp-report.generate.confirmPrompt = Confirm delete of existing output location %s?
-fcli.util.msp-report.generate.processing.app = Processing application %s
-fcli.util.msp-report.generate.processing.appversion = Processing application version %s
-fcli.util.msp-report.generate.warn.usingUploadDate = WARN: No scan date found for artifact id %s (%s), using upload date instead
-fcli.util.msp-report.generate-config.usage.header = Generate a sample configuration file for use by the 'generate' command.
-fcli.util.msp-report.generate-config.config = Name of the sample configuration file to be generated.
-fcli.util.msp-report.generate-config.confirm = Confirm overwrite of existing configuration file.
-
-# fcli util ncd-report
-fcli.util.ncd-report.usage.header = Configure and generate 'Number of Contributing Developers' (NCD) reports.
-fcli.util.ncd-report.generate.usage.header = Generate a 'Number of Contributing Developers' (NCD) report.
-fcli.util.ncd-report.generate.usage.description.0 = This command generates a 'Number of Contributing Developers' (NCD) report based on configuration settings defined in a configuration file. A sample configuration file can be generated using the 'fcli util ncd-report generate-config' command.\n
-fcli.util.ncd-report.generate.usage.description.1 = The configuration file includes rich settings for specifying the source code repositories from which to load contributing developer data (supporting multiple Source Code Management (SCM) systems), and for ignoring and de-duplicating contributing authors. \n
-fcli.util.ncd-report.generate.usage.description.2 = The generated report consists of multiple files, written to either a directory or zip-file. The primary output file is 'summary.txt' that contains various statistics, including the de-duplicated count of contributing developers. Various CSV files are generated with supporting proof, like the list of contributing authors, the list of commits that have been processed, and the list of repositories that have been processed.\n 
-fcli.util.ncd-report.generate.usage.description.3 = The generated 'checksums.sha256' file can be used to verify integrity of all generated files, using a command like 'sha256sum -c checksums.sha256'.
-fcli.util.ncd-report.generate.config = Configuration file; sample can be generated using the 'generate-config' command.
-fcli.util.ncd-report.generate.confirm = Confirm delete of existing report output location.
-fcli.util.ncd-report.generate.confirmPrompt = Confirm delete of existing output location %s?
-fcli.util.ncd-report.generate-config.usage.header = Generate a sample configuration file for use by the 'generate' command.
-fcli.util.ncd-report.generate-config.config = Name of the sample configuration file to be generated.
-fcli.util.ncd-report.generate-config.confirm = Confirm overwrite of existing configuration file.
-fcli.util.ncd-report.loading.commits = Loading commits for repository: %s
-fcli.util.ncd-report.loading.branch-commits = Loading commits for branch %s:%s
-fcli.util.ncd-report.loading.github-repositories = Loading repositories for GitHub organization: %s
-fcli.util.ncd-report.loading.gitlab-repositories = Loading repositories for GitLab group: %s
-
 # fcli util sample-data
 fcli.util.sample-data.usage.header = Generate sample data
 fcli.util.sample-data.usage.description = These commands generate and output a fixed set of sample data \
@@ -107,6 +65,22 @@ fcli.util.sample-data.list.usage.description = This commands retrieves a single
   output may vary between different fcli versions.   
 fcli.util.sample-data.id = Sample data record id
 
+# fcli util state
+fcli.util.state.usage.header = Manage fcli state data.
+fcli.util.state.usage.description = The commands in this module allow for managing fcli state, like clearing all state data. 
+fcli.util.state.clear.usage.header = Clear all fcli state data.
+fcli.util.state.clear.usage.description = This command deletes all state data from the fcli data directory. This includes variable data and session data. As a best practice, you should log out of existing sessions before running this command to perform proper session cleanup. This command does not clear fcli configuration data; please use the 'fcli config clear' command for clearing configuration data. 
+fcli.util.state.clear.confirm = Confirm deleting all fcli state.
+
+# fcli util variable
+fcli.util.variable.usage.header = Manage fcli variables.
+fcli.util.variable.clear.usage.header = Clear all fcli variables.
+fcli.util.variable.delete.usage.header = Delete a single fcli variable.
+fcli.util.variable.get.usage.header = Get fcli variable meta-data.
+fcli.util.variable.list.usage.header = List fcli variables.
+fcli.util.variable.contents.usage.header = Get fcli variable contents.
+fcli.util.variable.name = Variable name.
+
 #################################################################################################################
 # The following section lists human-readable header names used by table and tree output formats;
 # values may be internationalized. These messages may be prefixed with full or partial command
@@ -120,9 +94,9 @@ fcli.util.all-commands.list.output.header.optionsString = Options
 # The following are technical properties that shouldn't be internationalized ####################################
 #################################################################################################################
 fcli.util.all-commands.list.output.table.options = command,hidden,runnable,usageHeader
-fcli.util.msp-report.generate.output.table.options = reportPath,summary.errorCount
-fcli.util.msp-report.generate-config.output.table.options = path
-fcli.util.ncd-report.generate.output.table.options = reportPath,summary.errorCount
-fcli.util.ncd-report.generate-config.output.table.options = path
+fcli.util.state.clear.output.table.options = name,type
+# Empty on purpose; output columns depend on variable contents, so we don't want default variable columns
+fcli.util.variable.contents.output.table.options = 
+fcli.util.variable.output.table.options = created,accessed,name,defaultPropertyName,singular,encrypted
 
 
diff --git a/fcli-other/fcli-autocomplete/build.gradle b/fcli-other/fcli-autocomplete/build.gradle
index 298d29906a..129c42f564 100644
--- a/fcli-other/fcli-autocomplete/build.gradle
+++ b/fcli-other/fcli-autocomplete/build.gradle
@@ -2,7 +2,10 @@ apply plugin: 'java'
 
 dependencies {
 	runtimeOnly project("${fcliAppRef}")
-	runtimeOnly 'info.picocli:picocli-codegen'
+    // TODO May need to re-enable once patch for #2068 has been released,
+    //      but potentially the necessary dependency for picocli.AutoComplete 
+    //      is already available through the project dependency above. 
+	//runtimeOnly 'info.picocli:picocli-codegen'
 }
 
 task dist(type: JavaExec) {
diff --git a/fcli-other/fcli-doc/src/docs/asciidoc/versioned/index.adoc b/fcli-other/fcli-doc/src/docs/asciidoc/versioned/index.adoc
index b116f71bb2..20dbc0f426 100644
--- a/fcli-other/fcli-doc/src/docs/asciidoc/versioned/index.adoc
+++ b/fcli-other/fcli-doc/src/docs/asciidoc/versioned/index.adoc
@@ -309,7 +309,7 @@ Variables can be stored using the `+--store myVarName[:prop1,prop2]+` option on
 
 Variables can be referenced in subsequent fcli commands using the `::myVarName::prop` syntax anywhere on the command line; such occurrences will be substituted with the value of the given property name. 
 
-Many (but not all) fcli commands will also store an entity-specific default property name when using the `+--store+` option. Whether a default property name has been stored can be seen in the output of the `+fcli state var list+` command. If a default property name was stored, the `::myVarName::` syntax can be used to reference the value of the default property name, thereby avoiding the need to manually specify the appropriate property name.
+Many (but not all) fcli commands will also store an entity-specific default property name when using the `+--store+` option. Whether a default property name has been stored can be seen in the output of the `+fcli util variable list+` command. If a default property name was stored, the `::myVarName::` syntax can be used to reference the value of the default property name, thereby avoiding the need to manually specify the appropriate property name.
 
 Following are some examples, assuming the necessary login sessions are available:
 
@@ -328,16 +328,16 @@ fcli sc-sast scan start -p package.zip -v 22.2 --appversion test:1.0 --store x
 fcli sc-sast scan wait-for ::x::jobToken
 ----
 
-Fcli provides the regular `get`, `list` and `delete` operations on the `+fcli state variable` command tree, and actual variable contents can be retrieved using the `+fcli state variable contents+` command. Please see help output or manual pages for more information on these commands. 
+Fcli provides the regular `get`, `list` and `delete` operations on the `+fcli util variable` command tree, and actual variable contents can be retrieved using the `+fcli util variable contents+` command. Please see help output or manual pages for more information on these commands. 
 
-The `+fcli state variable contents+` command supports the regular fcli output options and query capabilities. This allows for advanced us cases, like retrieving server data once and then outputting it in multiple formats, potentially even applying separate filters. As an example:
+The `+fcli util variable contents+` command supports the regular fcli output options and query capabilities. This allows for advanced us cases, like retrieving server data once and then outputting it in multiple formats, potentially even applying separate filters. As an example:
 
 [source,bash]
 ----
 fcli ssc appversion list --store myVersions
-fcli state variable contents myVersions -o csv --output-to-file myVersions.csv
-fcli state variable contents myVersions -o json -q createdBy=admin --output-to-file myAdminVersions.json
-fcli state variable contents myVersions -o 'expr={id}\n' --output-to-file myVersionIds.txt
+fcli util variable contents myVersions -o csv --output-to-file myVersions.csv
+fcli util variable contents myVersions -o json -q createdBy=admin --output-to-file myAdminVersions.json
+fcli util variable contents myVersions -o 'expr={id}\n' --output-to-file myVersionIds.txt
 ----
 
 Note: variable-related syntax and behavior was changed in fcli version 2.0.0. If you are using an older fcli version, please refer to the documentation for that version. When upgrading from 1.x.x to 2.x.x, you may need to update your fcli invocations to match the new syntax. See link:https://github.com/fortify/fcli/issues/160[Issue 160] for information on why syntax and behavior was changed.
diff --git a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy
index f3a9ee14ac..c3e8c6f17e 100644
--- a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy
+++ b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/core/BasicInfoSpec.groovy
@@ -13,7 +13,6 @@ class BasicInfoSpec extends FcliBaseSpec {
             verifyAll(expectedSuccess ? result.stdout : result.stderr) {
                 it.any { it ==~ /.*Command-line interface for working with various Fortify products.*/ }
                 it.any { it.contains 'config' }
-                it.any { it.contains 'state' }
                 it.any { it.contains 'ssc' }
                 it.any { it.contains 'sc-dast' }
                 it.any { it.contains 'sc-sast' }
diff --git a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/report/NcdReportSpec.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/license/NcdReportSpec.groovy
similarity index 91%
rename from fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/report/NcdReportSpec.groovy
rename to fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/license/NcdReportSpec.groovy
index 0fc609c235..5fa84e7c74 100644
--- a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/report/NcdReportSpec.groovy
+++ b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/license/NcdReportSpec.groovy
@@ -10,7 +10,7 @@
  * herein. The information contained herein is subject to change 
  * without notice.
  */
-package com.fortify.cli.ftest.report
+package com.fortify.cli.ftest.license
 
 import com.fortify.cli.ftest._common.Fcli
 import com.fortify.cli.ftest._common.spec.FcliBaseSpec
@@ -30,7 +30,7 @@ class NcdReportSpec extends FcliBaseSpec {
     @Shared @TempFile("ncd-report.zip") String reportOutputZip;
     
     def "generate-config"() {
-        def args = "util ncd-report generate-config -y -c ${sampleConfigOutputFile} -o yaml"
+        def args = "license ncd-report generate-config -y -c ${sampleConfigOutputFile} -o yaml"
         when:
             def result = Fcli.run(args)
         then:
@@ -44,7 +44,7 @@ class NcdReportSpec extends FcliBaseSpec {
     
     @Requires({env.FCLI_FT_GITHUB_TOKEN && env.FCLI_FT_GITLAB_TOKEN})
     def "generate-dir"() {
-        def args = "util ncd-report generate -y -c ${configFile} -d ${reportOutputDir}"
+        def args = "license ncd-report generate -y -c ${configFile} -d ${reportOutputDir}"
         when:
             def result = Fcli.run(args)
         then:
@@ -69,7 +69,7 @@ class NcdReportSpec extends FcliBaseSpec {
     
     @Requires({env.FCLI_FT_GITHUB_TOKEN && env.FCLI_FT_GITLAB_TOKEN})
     def "generate-zip"() {
-        def args = "util ncd-report generate -y -c ${configFile} -z ${reportOutputZip}"
+        def args = "license ncd-report generate -y -c ${configFile} -z ${reportOutputZip}"
         when:
             def result = Fcli.run(args)
         then:
diff --git a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/_common/SSCAppVersion.groovy b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/_common/SSCAppVersion.groovy
index 266cf5de71..3daa215c17 100644
--- a/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/_common/SSCAppVersion.groovy
+++ b/fcli-other/fcli-functional-test/src/ftest/groovy/com/fortify/cli/ftest/ssc/_common/SSCAppVersion.groovy
@@ -29,7 +29,7 @@ public class SSCAppVersion implements Closeable, AutoCloseable {
     }
     
     public String get(String propertyPath) {
-        Fcli.run("state var contents $fcliVariableName -o expr={$propertyPath}",
+        Fcli.run("util var contents $fcliVariableName -o expr={$propertyPath}",
             {it.expectSuccess(true, "Error getting application version property "+propertyPath)})
             .stdout[0]  
     }
diff --git a/gradle.properties b/gradle.properties
index e9f7949982..73f8d647be 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -10,8 +10,8 @@ fcliFoDRef=:fcli-core:fcli-fod
 fcliSCDastRef=:fcli-core:fcli-sc-dast
 fcliSCSastRef=:fcli-core:fcli-sc-sast
 fcliSSCRef=:fcli-core:fcli-ssc
-fcliStateRef=:fcli-core:fcli-state
 fcliToolRef=:fcli-core:fcli-tool
+fcliLicenseRef=:fcli-core:fcli-license
 fcliUtilRef=:fcli-core:fcli-util
 
 fcliBomRef=:fcli-other:fcli-bom
diff --git a/settings.gradle b/settings.gradle
index 437e774bb3..5153ec7544 100644
--- a/settings.gradle
+++ b/settings.gradle
@@ -3,12 +3,12 @@ rootProject.name="fcli"
 include "$fcliBomRef"
 include "$fcliCommonRef"
 include "$fcliConfigRef"
-include "$fcliStateRef"
 include "$fcliSSCRef"
 include "$fcliFoDRef"
 include "$fcliSCSastRef"
 include "$fcliSCDastRef"
 include "$fcliToolRef"
+include "$fcliLicenseRef"
 include "$fcliUtilRef"
 include "$fcliAppRef"
 include "$fcliFunctionalTestRef"