diff --git a/.circleci/config.yml b/.circleci/config.yml
index 0a7e9fd41..18200f4ba 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -52,7 +52,7 @@ jobs:
       - run:
           name: Import app
           command: |
-            DocId=$(curl -s --data-binary @packages/serve/data/apps/ctrl00.qvf http://localhost:9076/v1/apps/import | jq -r '.attributes.id')
+            DocId=$(curl -s --data-binary @commands/serve/data/apps/ctrl00.qvf http://localhost:9076/v1/apps/import | jq -r '.attributes.id')
             echo "export DOC_ID=$DocId" >> $BASH_ENV
 
       - run:
@@ -71,7 +71,7 @@ jobs:
           name: Create a picasso barchart supernova project from current commit
           command: |
             set -e
-            ./packages/cli/lib/index.js create generated/barchart --picasso barchart --no-install
+            ./commands/cli/lib/index.js create generated/barchart --picasso barchart --no-install
             yarn
             cd generated/barchart
             npm i picasso.js picasso-plugin-q
diff --git a/packages/nucleus/__tests__/unit/header.spec.jsx b/apis/nucleus/__tests__/unit/header.spec.jsx
similarity index 100%
rename from packages/nucleus/__tests__/unit/header.spec.jsx
rename to apis/nucleus/__tests__/unit/header.spec.jsx
diff --git a/packages/nucleus/__tests__/unit/object-api.spec.js b/apis/nucleus/__tests__/unit/object-api.spec.js
similarity index 100%
rename from packages/nucleus/__tests__/unit/object-api.spec.js
rename to apis/nucleus/__tests__/unit/object-api.spec.js
diff --git a/packages/nucleus/__tests__/unit/selectiontoolbar.spec.jsx b/apis/nucleus/__tests__/unit/selectiontoolbar.spec.jsx
similarity index 100%
rename from packages/nucleus/__tests__/unit/selectiontoolbar.spec.jsx
rename to apis/nucleus/__tests__/unit/selectiontoolbar.spec.jsx
diff --git a/packages/nucleus/package.json b/apis/nucleus/package.json
similarity index 100%
rename from packages/nucleus/package.json
rename to apis/nucleus/package.json
diff --git a/packages/nucleus/src/__tests__/viz.spec.js b/apis/nucleus/src/__tests__/viz.spec.js
similarity index 100%
rename from packages/nucleus/src/__tests__/viz.spec.js
rename to apis/nucleus/src/__tests__/viz.spec.js
diff --git a/packages/nucleus/src/components/Cell.jsx b/apis/nucleus/src/components/Cell.jsx
similarity index 100%
rename from packages/nucleus/src/components/Cell.jsx
rename to apis/nucleus/src/components/Cell.jsx
diff --git a/packages/nucleus/src/components/Error.jsx b/apis/nucleus/src/components/Error.jsx
similarity index 100%
rename from packages/nucleus/src/components/Error.jsx
rename to apis/nucleus/src/components/Error.jsx
diff --git a/packages/nucleus/src/components/Footer.jsx b/apis/nucleus/src/components/Footer.jsx
similarity index 100%
rename from packages/nucleus/src/components/Footer.jsx
rename to apis/nucleus/src/components/Footer.jsx
diff --git a/packages/nucleus/src/components/Header.jsx b/apis/nucleus/src/components/Header.jsx
similarity index 100%
rename from packages/nucleus/src/components/Header.jsx
rename to apis/nucleus/src/components/Header.jsx
diff --git a/packages/nucleus/src/components/Loading.jsx b/apis/nucleus/src/components/Loading.jsx
similarity index 100%
rename from packages/nucleus/src/components/Loading.jsx
rename to apis/nucleus/src/components/Loading.jsx
diff --git a/packages/nucleus/src/components/NebulaApp.jsx b/apis/nucleus/src/components/NebulaApp.jsx
similarity index 100%
rename from packages/nucleus/src/components/NebulaApp.jsx
rename to apis/nucleus/src/components/NebulaApp.jsx
diff --git a/packages/nucleus/src/components/Placeholder.jsx b/apis/nucleus/src/components/Placeholder.jsx
similarity index 100%
rename from packages/nucleus/src/components/Placeholder.jsx
rename to apis/nucleus/src/components/Placeholder.jsx
diff --git a/packages/nucleus/src/components/Requirements.jsx b/apis/nucleus/src/components/Requirements.jsx
similarity index 100%
rename from packages/nucleus/src/components/Requirements.jsx
rename to apis/nucleus/src/components/Requirements.jsx
diff --git a/packages/nucleus/src/components/SelectionToolbar.jsx b/apis/nucleus/src/components/SelectionToolbar.jsx
similarity index 100%
rename from packages/nucleus/src/components/SelectionToolbar.jsx
rename to apis/nucleus/src/components/SelectionToolbar.jsx
diff --git a/packages/nucleus/src/components/SelectionToolbarItem.jsx b/apis/nucleus/src/components/SelectionToolbarItem.jsx
similarity index 100%
rename from packages/nucleus/src/components/SelectionToolbarItem.jsx
rename to apis/nucleus/src/components/SelectionToolbarItem.jsx
diff --git a/packages/nucleus/src/components/Supernova.jsx b/apis/nucleus/src/components/Supernova.jsx
similarity index 100%
rename from packages/nucleus/src/components/Supernova.jsx
rename to apis/nucleus/src/components/Supernova.jsx
diff --git a/packages/nucleus/src/components/boot.jsx b/apis/nucleus/src/components/boot.jsx
similarity index 100%
rename from packages/nucleus/src/components/boot.jsx
rename to apis/nucleus/src/components/boot.jsx
diff --git a/packages/nucleus/src/components/listbox/ListBox.jsx b/apis/nucleus/src/components/listbox/ListBox.jsx
similarity index 100%
rename from packages/nucleus/src/components/listbox/ListBox.jsx
rename to apis/nucleus/src/components/listbox/ListBox.jsx
diff --git a/packages/nucleus/src/components/listbox/ListBoxPopover.jsx b/apis/nucleus/src/components/listbox/ListBoxPopover.jsx
similarity index 100%
rename from packages/nucleus/src/components/listbox/ListBoxPopover.jsx
rename to apis/nucleus/src/components/listbox/ListBoxPopover.jsx
diff --git a/packages/nucleus/src/components/listbox/ListBoxRow.jsx b/apis/nucleus/src/components/listbox/ListBoxRow.jsx
similarity index 100%
rename from packages/nucleus/src/components/listbox/ListBoxRow.jsx
rename to apis/nucleus/src/components/listbox/ListBoxRow.jsx
diff --git a/packages/nucleus/src/components/selections/AppSelections.jsx b/apis/nucleus/src/components/selections/AppSelections.jsx
similarity index 100%
rename from packages/nucleus/src/components/selections/AppSelections.jsx
rename to apis/nucleus/src/components/selections/AppSelections.jsx
diff --git a/packages/nucleus/src/components/selections/MultiState.jsx b/apis/nucleus/src/components/selections/MultiState.jsx
similarity index 100%
rename from packages/nucleus/src/components/selections/MultiState.jsx
rename to apis/nucleus/src/components/selections/MultiState.jsx
diff --git a/packages/nucleus/src/components/selections/Nav.jsx b/apis/nucleus/src/components/selections/Nav.jsx
similarity index 100%
rename from packages/nucleus/src/components/selections/Nav.jsx
rename to apis/nucleus/src/components/selections/Nav.jsx
diff --git a/packages/nucleus/src/components/selections/OneField.jsx b/apis/nucleus/src/components/selections/OneField.jsx
similarity index 100%
rename from packages/nucleus/src/components/selections/OneField.jsx
rename to apis/nucleus/src/components/selections/OneField.jsx
diff --git a/packages/nucleus/src/components/selections/SelectedFields.jsx b/apis/nucleus/src/components/selections/SelectedFields.jsx
similarity index 100%
rename from packages/nucleus/src/components/selections/SelectedFields.jsx
rename to apis/nucleus/src/components/selections/SelectedFields.jsx
diff --git a/packages/nucleus/src/components/selections/__tests__/app-selections.spec.jsx b/apis/nucleus/src/components/selections/__tests__/app-selections.spec.jsx
similarity index 100%
rename from packages/nucleus/src/components/selections/__tests__/app-selections.spec.jsx
rename to apis/nucleus/src/components/selections/__tests__/app-selections.spec.jsx
diff --git a/packages/nucleus/src/contexts/LocaleContext.js b/apis/nucleus/src/contexts/LocaleContext.js
similarity index 100%
rename from packages/nucleus/src/contexts/LocaleContext.js
rename to apis/nucleus/src/contexts/LocaleContext.js
diff --git a/packages/nucleus/src/hooks/useLayout.js b/apis/nucleus/src/hooks/useLayout.js
similarity index 100%
rename from packages/nucleus/src/hooks/useLayout.js
rename to apis/nucleus/src/hooks/useLayout.js
diff --git a/packages/nucleus/src/hooks/useModel.js b/apis/nucleus/src/hooks/useModel.js
similarity index 100%
rename from packages/nucleus/src/hooks/useModel.js
rename to apis/nucleus/src/hooks/useModel.js
diff --git a/packages/nucleus/src/hooks/useProperties.js b/apis/nucleus/src/hooks/useProperties.js
similarity index 100%
rename from packages/nucleus/src/hooks/useProperties.js
rename to apis/nucleus/src/hooks/useProperties.js
diff --git a/packages/nucleus/src/index.js b/apis/nucleus/src/index.js
similarity index 100%
rename from packages/nucleus/src/index.js
rename to apis/nucleus/src/index.js
diff --git a/packages/nucleus/src/locale/index.js b/apis/nucleus/src/locale/index.js
similarity index 100%
rename from packages/nucleus/src/locale/index.js
rename to apis/nucleus/src/locale/index.js
diff --git a/packages/nucleus/src/locale/translations/en-US.js b/apis/nucleus/src/locale/translations/en-US.js
similarity index 100%
rename from packages/nucleus/src/locale/translations/en-US.js
rename to apis/nucleus/src/locale/translations/en-US.js
diff --git a/packages/nucleus/src/locale/translator.js b/apis/nucleus/src/locale/translator.js
similarity index 100%
rename from packages/nucleus/src/locale/translator.js
rename to apis/nucleus/src/locale/translator.js
diff --git a/packages/nucleus/src/object/__tests__/observer.spec.js b/apis/nucleus/src/object/__tests__/observer.spec.js
similarity index 100%
rename from packages/nucleus/src/object/__tests__/observer.spec.js
rename to apis/nucleus/src/object/__tests__/observer.spec.js
diff --git a/packages/nucleus/src/object/create-object.js b/apis/nucleus/src/object/create-object.js
similarity index 100%
rename from packages/nucleus/src/object/create-object.js
rename to apis/nucleus/src/object/create-object.js
diff --git a/packages/nucleus/src/object/get-object.js b/apis/nucleus/src/object/get-object.js
similarity index 100%
rename from packages/nucleus/src/object/get-object.js
rename to apis/nucleus/src/object/get-object.js
diff --git a/packages/nucleus/src/object/hc-handler.js b/apis/nucleus/src/object/hc-handler.js
similarity index 100%
rename from packages/nucleus/src/object/hc-handler.js
rename to apis/nucleus/src/object/hc-handler.js
diff --git a/packages/nucleus/src/object/model-cache.js b/apis/nucleus/src/object/model-cache.js
similarity index 100%
rename from packages/nucleus/src/object/model-cache.js
rename to apis/nucleus/src/object/model-cache.js
diff --git a/packages/nucleus/src/object/object-api.js b/apis/nucleus/src/object/object-api.js
similarity index 100%
rename from packages/nucleus/src/object/object-api.js
rename to apis/nucleus/src/object/object-api.js
diff --git a/packages/nucleus/src/object/observer.js b/apis/nucleus/src/object/observer.js
similarity index 100%
rename from packages/nucleus/src/object/observer.js
rename to apis/nucleus/src/object/observer.js
diff --git a/packages/nucleus/src/object/populator.js b/apis/nucleus/src/object/populator.js
similarity index 100%
rename from packages/nucleus/src/object/populator.js
rename to apis/nucleus/src/object/populator.js
diff --git a/packages/nucleus/src/selections/app-selections.js b/apis/nucleus/src/selections/app-selections.js
similarity index 100%
rename from packages/nucleus/src/selections/app-selections.js
rename to apis/nucleus/src/selections/app-selections.js
diff --git a/packages/nucleus/src/selections/event-mixin.js b/apis/nucleus/src/selections/event-mixin.js
similarity index 100%
rename from packages/nucleus/src/selections/event-mixin.js
rename to apis/nucleus/src/selections/event-mixin.js
diff --git a/packages/nucleus/src/selections/index.js b/apis/nucleus/src/selections/index.js
similarity index 100%
rename from packages/nucleus/src/selections/index.js
rename to apis/nucleus/src/selections/index.js
diff --git a/packages/nucleus/src/selections/object-selections.js b/apis/nucleus/src/selections/object-selections.js
similarity index 100%
rename from packages/nucleus/src/selections/object-selections.js
rename to apis/nucleus/src/selections/object-selections.js
diff --git a/packages/nucleus/src/sn/__tests__/type.spec.js b/apis/nucleus/src/sn/__tests__/type.spec.js
similarity index 100%
rename from packages/nucleus/src/sn/__tests__/type.spec.js
rename to apis/nucleus/src/sn/__tests__/type.spec.js
diff --git a/packages/nucleus/src/sn/__tests__/types.spec.js b/apis/nucleus/src/sn/__tests__/types.spec.js
similarity index 100%
rename from packages/nucleus/src/sn/__tests__/types.spec.js
rename to apis/nucleus/src/sn/__tests__/types.spec.js
diff --git a/packages/nucleus/src/sn/load.js b/apis/nucleus/src/sn/load.js
similarity index 100%
rename from packages/nucleus/src/sn/load.js
rename to apis/nucleus/src/sn/load.js
diff --git a/packages/nucleus/src/sn/type.js b/apis/nucleus/src/sn/type.js
similarity index 100%
rename from packages/nucleus/src/sn/type.js
rename to apis/nucleus/src/sn/type.js
diff --git a/packages/nucleus/src/sn/types.js b/apis/nucleus/src/sn/types.js
similarity index 100%
rename from packages/nucleus/src/sn/types.js
rename to apis/nucleus/src/sn/types.js
diff --git a/packages/nucleus/src/utils/logger.js b/apis/nucleus/src/utils/logger.js
similarity index 100%
rename from packages/nucleus/src/utils/logger.js
rename to apis/nucleus/src/utils/logger.js
diff --git a/packages/nucleus/src/utils/patcher.js b/apis/nucleus/src/utils/patcher.js
similarity index 100%
rename from packages/nucleus/src/utils/patcher.js
rename to apis/nucleus/src/utils/patcher.js
diff --git a/packages/nucleus/src/utils/utils.js b/apis/nucleus/src/utils/utils.js
similarity index 100%
rename from packages/nucleus/src/utils/utils.js
rename to apis/nucleus/src/utils/utils.js
diff --git a/packages/nucleus/src/viz.js b/apis/nucleus/src/viz.js
similarity index 100%
rename from packages/nucleus/src/viz.js
rename to apis/nucleus/src/viz.js
diff --git a/packages/supernova/__tests__/unit/creator.spec.js b/apis/supernova/__tests__/unit/creator.spec.js
similarity index 100%
rename from packages/supernova/__tests__/unit/creator.spec.js
rename to apis/supernova/__tests__/unit/creator.spec.js
diff --git a/packages/supernova/__tests__/unit/generator.spec.js b/apis/supernova/__tests__/unit/generator.spec.js
similarity index 100%
rename from packages/supernova/__tests__/unit/generator.spec.js
rename to apis/supernova/__tests__/unit/generator.spec.js
diff --git a/packages/supernova/__tests__/unit/qae.spec.js b/apis/supernova/__tests__/unit/qae.spec.js
similarity index 100%
rename from packages/supernova/__tests__/unit/qae.spec.js
rename to apis/supernova/__tests__/unit/qae.spec.js
diff --git a/packages/supernova/package.json b/apis/supernova/package.json
similarity index 100%
rename from packages/supernova/package.json
rename to apis/supernova/package.json
diff --git a/packages/supernova/src/action-hero.js b/apis/supernova/src/action-hero.js
similarity index 100%
rename from packages/supernova/src/action-hero.js
rename to apis/supernova/src/action-hero.js
diff --git a/packages/supernova/src/creator.js b/apis/supernova/src/creator.js
similarity index 100%
rename from packages/supernova/src/creator.js
rename to apis/supernova/src/creator.js
diff --git a/packages/supernova/src/generator.js b/apis/supernova/src/generator.js
similarity index 100%
rename from packages/supernova/src/generator.js
rename to apis/supernova/src/generator.js
diff --git a/packages/supernova/src/index.js b/apis/supernova/src/index.js
similarity index 100%
rename from packages/supernova/src/index.js
rename to apis/supernova/src/index.js
diff --git a/packages/supernova/src/qae.js b/apis/supernova/src/qae.js
similarity index 100%
rename from packages/supernova/src/qae.js
rename to apis/supernova/src/qae.js
diff --git a/packages/supernova/src/translator.js b/apis/supernova/src/translator.js
similarity index 100%
rename from packages/supernova/src/translator.js
rename to apis/supernova/src/translator.js
diff --git a/packages/build/README.md b/commands/build/README.md
similarity index 100%
rename from packages/build/README.md
rename to commands/build/README.md
diff --git a/packages/build/build.js b/commands/build/build.js
similarity index 100%
rename from packages/build/build.js
rename to commands/build/build.js
diff --git a/packages/build/command.js b/commands/build/command.js
similarity index 100%
rename from packages/build/command.js
rename to commands/build/command.js
diff --git a/packages/build/package.json b/commands/build/package.json
similarity index 100%
rename from packages/build/package.json
rename to commands/build/package.json
diff --git a/packages/cli/README.md b/commands/cli/README.md
similarity index 100%
rename from packages/cli/README.md
rename to commands/cli/README.md
diff --git a/packages/cli/lib/index.js b/commands/cli/lib/index.js
similarity index 100%
rename from packages/cli/lib/index.js
rename to commands/cli/lib/index.js
diff --git a/packages/cli/package.json b/commands/cli/package.json
similarity index 100%
rename from packages/cli/package.json
rename to commands/cli/package.json
diff --git a/packages/create/README.md b/commands/create/README.md
similarity index 100%
rename from packages/create/README.md
rename to commands/create/README.md
diff --git a/packages/create/command.js b/commands/create/command.js
similarity index 92%
rename from packages/create/command.js
rename to commands/create/command.js
index 1f328704b..10b3b13bb 100644
--- a/packages/create/command.js
+++ b/commands/create/command.js
@@ -1,4 +1,4 @@
-const create = require('./lib');
+const create = require('./lib/create');
 
 module.exports = {
   command: 'create <name>',
@@ -28,7 +28,7 @@ module.exports = {
       description: 'Package author',
     });
   },
-  async handler(argv) {
+  handler(argv) {
     create(argv);
   },
 };
diff --git a/packages/create/lib/index.js b/commands/create/lib/create.js
similarity index 100%
rename from packages/create/lib/index.js
rename to commands/create/lib/create.js
diff --git a/packages/create/package.json b/commands/create/package.json
similarity index 95%
rename from packages/create/package.json
rename to commands/create/package.json
index 9142cfe84..d4d7512d7 100644
--- a/packages/create/package.json
+++ b/commands/create/package.json
@@ -8,6 +8,7 @@
   "publishConfig": {
     "access": "public"
   },
+  "main": "lib/create.js",
   "repository": {
     "type": "git",
     "url": "https://github.com/qlik-oss/nebula.js.git"
diff --git a/packages/create/templates/common/README.md b/commands/create/templates/common/README.md
similarity index 100%
rename from packages/create/templates/common/README.md
rename to commands/create/templates/common/README.md
diff --git a/packages/create/templates/common/_editorconfig b/commands/create/templates/common/_editorconfig
similarity index 100%
rename from packages/create/templates/common/_editorconfig
rename to commands/create/templates/common/_editorconfig
diff --git a/packages/create/templates/common/_eslintignore b/commands/create/templates/common/_eslintignore
similarity index 100%
rename from packages/create/templates/common/_eslintignore
rename to commands/create/templates/common/_eslintignore
diff --git a/packages/create/templates/common/_eslintrc.json b/commands/create/templates/common/_eslintrc.json
similarity index 100%
rename from packages/create/templates/common/_eslintrc.json
rename to commands/create/templates/common/_eslintrc.json
diff --git a/packages/create/templates/common/_gitignore b/commands/create/templates/common/_gitignore
similarity index 100%
rename from packages/create/templates/common/_gitignore
rename to commands/create/templates/common/_gitignore
diff --git a/packages/create/templates/none/_package.json b/commands/create/templates/none/_package.json
similarity index 100%
rename from packages/create/templates/none/_package.json
rename to commands/create/templates/none/_package.json
diff --git a/packages/create/templates/none/src/data.js b/commands/create/templates/none/src/data.js
similarity index 100%
rename from packages/create/templates/none/src/data.js
rename to commands/create/templates/none/src/data.js
diff --git a/packages/create/templates/none/src/index.js b/commands/create/templates/none/src/index.js
similarity index 100%
rename from packages/create/templates/none/src/index.js
rename to commands/create/templates/none/src/index.js
diff --git a/packages/create/templates/none/src/object-properties.js b/commands/create/templates/none/src/object-properties.js
similarity index 100%
rename from packages/create/templates/none/src/object-properties.js
rename to commands/create/templates/none/src/object-properties.js
diff --git a/packages/create/templates/none/test/integration/hello.int.js b/commands/create/templates/none/test/integration/hello.int.js
similarity index 100%
rename from packages/create/templates/none/test/integration/hello.int.js
rename to commands/create/templates/none/test/integration/hello.int.js
diff --git a/packages/create/templates/none/test/integration/setup.int.js b/commands/create/templates/none/test/integration/setup.int.js
similarity index 100%
rename from packages/create/templates/none/test/integration/setup.int.js
rename to commands/create/templates/none/test/integration/setup.int.js
diff --git a/packages/create/templates/picasso/barchart/src/data.js b/commands/create/templates/picasso/barchart/src/data.js
similarity index 100%
rename from packages/create/templates/picasso/barchart/src/data.js
rename to commands/create/templates/picasso/barchart/src/data.js
diff --git a/packages/create/templates/picasso/barchart/src/object-properties.js b/commands/create/templates/picasso/barchart/src/object-properties.js
similarity index 100%
rename from packages/create/templates/picasso/barchart/src/object-properties.js
rename to commands/create/templates/picasso/barchart/src/object-properties.js
diff --git a/packages/create/templates/picasso/barchart/src/pic-definition.js b/commands/create/templates/picasso/barchart/src/pic-definition.js
similarity index 100%
rename from packages/create/templates/picasso/barchart/src/pic-definition.js
rename to commands/create/templates/picasso/barchart/src/pic-definition.js
diff --git a/packages/create/templates/picasso/barchart/test/integration/interaction.int.js b/commands/create/templates/picasso/barchart/test/integration/interaction.int.js
similarity index 100%
rename from packages/create/templates/picasso/barchart/test/integration/interaction.int.js
rename to commands/create/templates/picasso/barchart/test/integration/interaction.int.js
diff --git a/packages/create/templates/picasso/common/_package.json b/commands/create/templates/picasso/common/_package.json
similarity index 100%
rename from packages/create/templates/picasso/common/_package.json
rename to commands/create/templates/picasso/common/_package.json
diff --git a/packages/create/templates/picasso/common/src/index.js b/commands/create/templates/picasso/common/src/index.js
similarity index 100%
rename from packages/create/templates/picasso/common/src/index.js
rename to commands/create/templates/picasso/common/src/index.js
diff --git a/packages/create/templates/picasso/common/src/pic-selections.js b/commands/create/templates/picasso/common/src/pic-selections.js
similarity index 100%
rename from packages/create/templates/picasso/common/src/pic-selections.js
rename to commands/create/templates/picasso/common/src/pic-selections.js
diff --git a/packages/create/templates/picasso/common/test/integration/setup.int.js b/commands/create/templates/picasso/common/test/integration/setup.int.js
similarity index 100%
rename from packages/create/templates/picasso/common/test/integration/setup.int.js
rename to commands/create/templates/picasso/common/test/integration/setup.int.js
diff --git a/packages/create/templates/picasso/minimal/src/data.js b/commands/create/templates/picasso/minimal/src/data.js
similarity index 100%
rename from packages/create/templates/picasso/minimal/src/data.js
rename to commands/create/templates/picasso/minimal/src/data.js
diff --git a/packages/create/templates/picasso/minimal/src/object-properties.js b/commands/create/templates/picasso/minimal/src/object-properties.js
similarity index 100%
rename from packages/create/templates/picasso/minimal/src/object-properties.js
rename to commands/create/templates/picasso/minimal/src/object-properties.js
diff --git a/packages/create/templates/picasso/minimal/src/pic-definition.js b/commands/create/templates/picasso/minimal/src/pic-definition.js
similarity index 100%
rename from packages/create/templates/picasso/minimal/src/pic-definition.js
rename to commands/create/templates/picasso/minimal/src/pic-definition.js
diff --git a/packages/sense/README.md b/commands/sense/README.md
similarity index 100%
rename from packages/sense/README.md
rename to commands/sense/README.md
diff --git a/packages/sense/command.js b/commands/sense/command.js
similarity index 100%
rename from packages/sense/command.js
rename to commands/sense/command.js
diff --git a/packages/sense/lib/build.js b/commands/sense/lib/build.js
similarity index 100%
rename from packages/sense/lib/build.js
rename to commands/sense/lib/build.js
diff --git a/packages/sense/package.json b/commands/sense/package.json
similarity index 97%
rename from packages/sense/package.json
rename to commands/sense/package.json
index 627b57ed3..752618f32 100644
--- a/packages/sense/package.json
+++ b/commands/sense/package.json
@@ -17,7 +17,7 @@
     "type": "git",
     "url": "https://github.com/qlik-oss/nebula.js.git"
   },
-  "main": "build.js",
+  "main": "lib/build.js",
   "files": [
     "command.js",
     "lib",
diff --git a/packages/sense/src/__tests__/permissions.spec.js b/commands/sense/src/__tests__/permissions.spec.js
similarity index 100%
rename from packages/sense/src/__tests__/permissions.spec.js
rename to commands/sense/src/__tests__/permissions.spec.js
diff --git a/packages/sense/src/ext-definition.js b/commands/sense/src/ext-definition.js
similarity index 100%
rename from packages/sense/src/ext-definition.js
rename to commands/sense/src/ext-definition.js
diff --git a/packages/sense/src/permissions.js b/commands/sense/src/permissions.js
similarity index 100%
rename from packages/sense/src/permissions.js
rename to commands/sense/src/permissions.js
diff --git a/packages/sense/src/selections.js b/commands/sense/src/selections.js
similarity index 100%
rename from packages/sense/src/selections.js
rename to commands/sense/src/selections.js
diff --git a/packages/sense/src/supernova-wrapper.js b/commands/sense/src/supernova-wrapper.js
similarity index 100%
rename from packages/sense/src/supernova-wrapper.js
rename to commands/sense/src/supernova-wrapper.js
diff --git a/packages/serve/README.md b/commands/serve/README.md
similarity index 100%
rename from packages/serve/README.md
rename to commands/serve/README.md
diff --git a/packages/serve/command.js b/commands/serve/command.js
similarity index 97%
rename from packages/serve/command.js
rename to commands/serve/command.js
index 374d65d99..babfce209 100644
--- a/packages/serve/command.js
+++ b/commands/serve/command.js
@@ -24,7 +24,7 @@ module.exports = {
     yargs.option('enigma.port', {
       type: 'port',
       default: 9076,
-    });
+    }).argv;
   },
   handler(argv) {
     serve(argv);
diff --git a/packages/serve/data/apps/ctrl00.qvf b/commands/serve/data/apps/ctrl00.qvf
similarity index 100%
rename from packages/serve/data/apps/ctrl00.qvf
rename to commands/serve/data/apps/ctrl00.qvf
diff --git a/packages/serve/docker-compose.yml b/commands/serve/docker-compose.yml
similarity index 100%
rename from packages/serve/docker-compose.yml
rename to commands/serve/docker-compose.yml
diff --git a/packages/serve/lib/engine.js b/commands/serve/lib/engine.js
similarity index 100%
rename from packages/serve/lib/engine.js
rename to commands/serve/lib/engine.js
diff --git a/packages/serve/lib/placeholder.js b/commands/serve/lib/placeholder.js
similarity index 100%
rename from packages/serve/lib/placeholder.js
rename to commands/serve/lib/placeholder.js
diff --git a/packages/serve/lib/serve.js b/commands/serve/lib/serve.js
similarity index 100%
rename from packages/serve/lib/serve.js
rename to commands/serve/lib/serve.js
diff --git a/packages/serve/lib/sn.js b/commands/serve/lib/sn.js
similarity index 100%
rename from packages/serve/lib/sn.js
rename to commands/serve/lib/sn.js
diff --git a/packages/serve/lib/webpack.build.js b/commands/serve/lib/webpack.build.js
similarity index 100%
rename from packages/serve/lib/webpack.build.js
rename to commands/serve/lib/webpack.build.js
diff --git a/packages/serve/lib/webpack.prod.js b/commands/serve/lib/webpack.prod.js
similarity index 100%
rename from packages/serve/lib/webpack.prod.js
rename to commands/serve/lib/webpack.prod.js
diff --git a/packages/serve/lib/webpack.serve.js b/commands/serve/lib/webpack.serve.js
similarity index 100%
rename from packages/serve/lib/webpack.serve.js
rename to commands/serve/lib/webpack.serve.js
diff --git a/packages/serve/package.json b/commands/serve/package.json
similarity index 100%
rename from packages/serve/package.json
rename to commands/serve/package.json
diff --git a/packages/serve/web/.eslintrc.json b/commands/serve/web/.eslintrc.json
similarity index 100%
rename from packages/serve/web/.eslintrc.json
rename to commands/serve/web/.eslintrc.json
diff --git a/packages/serve/web/components/App.jsx b/commands/serve/web/components/App.jsx
similarity index 100%
rename from packages/serve/web/components/App.jsx
rename to commands/serve/web/components/App.jsx
diff --git a/packages/serve/web/components/Cell.jsx b/commands/serve/web/components/Cell.jsx
similarity index 100%
rename from packages/serve/web/components/Cell.jsx
rename to commands/serve/web/components/Cell.jsx
diff --git a/packages/serve/web/components/Chart.jsx b/commands/serve/web/components/Chart.jsx
similarity index 100%
rename from packages/serve/web/components/Chart.jsx
rename to commands/serve/web/components/Chart.jsx
diff --git a/packages/serve/web/components/Collection.jsx b/commands/serve/web/components/Collection.jsx
similarity index 100%
rename from packages/serve/web/components/Collection.jsx
rename to commands/serve/web/components/Collection.jsx
diff --git a/packages/serve/web/components/FieldsPopover.jsx b/commands/serve/web/components/FieldsPopover.jsx
similarity index 100%
rename from packages/serve/web/components/FieldsPopover.jsx
rename to commands/serve/web/components/FieldsPopover.jsx
diff --git a/packages/serve/web/components/Properties.jsx b/commands/serve/web/components/Properties.jsx
similarity index 100%
rename from packages/serve/web/components/Properties.jsx
rename to commands/serve/web/components/Properties.jsx
diff --git a/packages/serve/web/components/PropertiesDialog.jsx b/commands/serve/web/components/PropertiesDialog.jsx
similarity index 100%
rename from packages/serve/web/components/PropertiesDialog.jsx
rename to commands/serve/web/components/PropertiesDialog.jsx
diff --git a/packages/serve/web/components/Stage.jsx b/commands/serve/web/components/Stage.jsx
similarity index 100%
rename from packages/serve/web/components/Stage.jsx
rename to commands/serve/web/components/Stage.jsx
diff --git a/packages/serve/web/components/property-panel/Data.jsx b/commands/serve/web/components/property-panel/Data.jsx
similarity index 100%
rename from packages/serve/web/components/property-panel/Data.jsx
rename to commands/serve/web/components/property-panel/Data.jsx
diff --git a/packages/serve/web/components/property-panel/Fields.jsx b/commands/serve/web/components/property-panel/Fields.jsx
similarity index 100%
rename from packages/serve/web/components/property-panel/Fields.jsx
rename to commands/serve/web/components/property-panel/Fields.jsx
diff --git a/packages/serve/web/components/property-panel/HyperCube.jsx b/commands/serve/web/components/property-panel/HyperCube.jsx
similarity index 100%
rename from packages/serve/web/components/property-panel/HyperCube.jsx
rename to commands/serve/web/components/property-panel/HyperCube.jsx
diff --git a/packages/serve/web/connect.js b/commands/serve/web/connect.js
similarity index 100%
rename from packages/serve/web/connect.js
rename to commands/serve/web/connect.js
diff --git a/packages/serve/web/contexts/AppContext.js b/commands/serve/web/contexts/AppContext.js
similarity index 100%
rename from packages/serve/web/contexts/AppContext.js
rename to commands/serve/web/contexts/AppContext.js
diff --git a/packages/serve/web/contexts/NebulaContext.js b/commands/serve/web/contexts/NebulaContext.js
similarity index 100%
rename from packages/serve/web/contexts/NebulaContext.js
rename to commands/serve/web/contexts/NebulaContext.js
diff --git a/packages/serve/web/eDev.html b/commands/serve/web/eDev.html
similarity index 100%
rename from packages/serve/web/eDev.html
rename to commands/serve/web/eDev.html
diff --git a/packages/serve/web/eDev.jsx b/commands/serve/web/eDev.jsx
similarity index 100%
rename from packages/serve/web/eDev.jsx
rename to commands/serve/web/eDev.jsx
diff --git a/packages/serve/web/eHub.html b/commands/serve/web/eHub.html
similarity index 100%
rename from packages/serve/web/eHub.html
rename to commands/serve/web/eHub.html
diff --git a/packages/serve/web/eHub.js b/commands/serve/web/eHub.js
similarity index 100%
rename from packages/serve/web/eHub.js
rename to commands/serve/web/eHub.js
diff --git a/packages/serve/web/eRender.html b/commands/serve/web/eRender.html
similarity index 100%
rename from packages/serve/web/eRender.html
rename to commands/serve/web/eRender.html
diff --git a/packages/serve/web/eRender.js b/commands/serve/web/eRender.js
similarity index 100%
rename from packages/serve/web/eRender.js
rename to commands/serve/web/eRender.js
diff --git a/packages/serve/web/hooks/useLibraryList.js b/commands/serve/web/hooks/useLibraryList.js
similarity index 100%
rename from packages/serve/web/hooks/useLibraryList.js
rename to commands/serve/web/hooks/useLibraryList.js
diff --git a/package.json b/package.json
index ab22c5a19..fdac31eb0 100644
--- a/package.json
+++ b/package.json
@@ -4,9 +4,9 @@
   "scripts": {
     "build": "cross-env NODE_ENV=production FORCE_COLOR=1 lerna run build --stream",
     "build:watch": "FORCE_COLOR=1 lerna run build:watch --stream --concurrency 99 --no-sort",
-    "lint": "eslint packages --ext .js,.jsx",
+    "lint": "eslint packages apis commands --ext .js,.jsx",
     "lint:check": "eslint --print-config ./aw.config.js | eslint-config-prettier-check",
-    "start": "MONO=true ./packages/cli/lib/index.js serve --entry ./test/integration/sn.js",
+    "start": "MONO=true ./commands/cli/lib/index.js serve --entry ./test/integration/sn.js",
     "test": "yarn run test:unit",
     "test:integration": "aw puppet -c aw.config.js --testExt '*.int.js' --glob 'test/integration/*.int.js'",
     "test:unit": "aw -c aw.config.js"
@@ -64,6 +64,8 @@
   },
   "workspaces": [
     "generated/*",
-    "packages/*"
+    "packages/*",
+    "commands/*",
+    "apis/*"
   ]
 }
diff --git a/rollup.config.js b/rollup.config.js
index be1cc49ce..629463d55 100644
--- a/rollup.config.js
+++ b/rollup.config.js
@@ -7,11 +7,7 @@ const { terser } = require('rollup-plugin-terser');
 
 const cwd = process.cwd();
 const pkg = require(path.join(cwd, 'package.json')); // eslint-disable-line
-const {
-  name,
-  version,
-  license,
-} = pkg;
+const { name, version, license } = pkg;
 
 const banner = `/*
 * ${name} v${version}
@@ -57,11 +53,14 @@ const propTypes = [
 
 const watch = process.argv.indexOf('-w') > 2;
 
-const config = (isEsm) => {
+const config = isEsm => {
   const outputFile = isEsm ? pkg.module : pkg.main;
   const basename = path.basename(outputFile);
   const dir = path.dirname(outputFile);
-  const umdName = basename.replace(/-([a-z])/g, (m, p1) => p1.toUpperCase()).split('.js').join('');
+  const umdName = basename
+    .replace(/-([a-z])/g, (m, p1) => p1.toUpperCase())
+    .split('.js')
+    .join('');
 
   if (Object.keys(pkg.dependencies || {}).length) {
     throw new Error('Dependencies for a web javascript library makes no sense');
@@ -73,11 +72,11 @@ const config = (isEsm) => {
   const esmExternals = peers;
 
   // peers that are not devDeps should be externals for full bundle
-  const bundleExternals = peers.filter((p) => typeof (pkg.devDependencies || {})[p] === 'undefined');
+  const bundleExternals = peers.filter(p => typeof (pkg.devDependencies || {})[p] === 'undefined');
 
   const external = isEsm ? esmExternals : bundleExternals;
   const globals = {};
-  external.forEach((e) => {
+  external.forEach(e => {
     if ([GLOBALS[e]]) {
       globals[e] = GLOBALS[e];
     }
@@ -127,38 +126,34 @@ const config = (isEsm) => {
       }),
       babel({
         babelrc: false,
-        include: [
-          '/**/packages/nucleus/**',
-          '/**/packages/supernova/**',
-          '/**/packages/ui/**',
-        ],
+        include: ['/**/apis/nucleus/**', '/**/apis/supernova/**', '/**/packages/ui/**'],
         presets: [
-          ['@babel/preset-env', {
-            modules: false,
-            targets: {
-              browsers: [...browserList, ...(['ie 11', 'chrome 47'])],
+          [
+            '@babel/preset-env',
+            {
+              modules: false,
+              targets: {
+                browsers: [...browserList, ...['ie 11', 'chrome 47']],
+              },
             },
-          }],
-        ],
-        plugins: [
-          ['@babel/plugin-transform-react-jsx'],
+          ],
         ],
+        plugins: [['@babel/plugin-transform-react-jsx']],
       }),
     ],
   };
 
   if (process.env.NODE_ENV === 'production' && !isEsm) {
-    cfg.plugins.push(terser({
-      output: {
-        preamble: banner,
-      },
-    }));
+    cfg.plugins.push(
+      terser({
+        output: {
+          preamble: banner,
+        },
+      })
+    );
   }
 
   return cfg;
 };
 
-module.exports = [
-  watch ? false : config(),
-  config(true),
-].filter(Boolean);
+module.exports = [watch ? false : config(), config(true)].filter(Boolean);