diff --git a/app/agent/components/host-browser/host-browser-controller.js b/app/agent/components/host-browser/host-browser-controller.js
index a50cb6b6e..06c313083 100644
--- a/app/agent/components/host-browser/host-browser-controller.js
+++ b/app/agent/components/host-browser/host-browser-controller.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import _ from 'lodash';
+
 angular.module('portainer.agent').controller('HostBrowserController', [
   'HostBrowserService', 'Notifications', 'FileSaver', 'ModalService',
   function HostBrowserController(HostBrowserService, Notifications, FileSaver, ModalService) {
diff --git a/app/agent/components/volume-browser/volumeBrowserController.js b/app/agent/components/volume-browser/volumeBrowserController.js
index 2fa4426b9..c4c0e9d02 100644
--- a/app/agent/components/volume-browser/volumeBrowserController.js
+++ b/app/agent/components/volume-browser/volumeBrowserController.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import _ from 'lodash';
+
 angular.module('portainer.agent')
 .controller('VolumeBrowserController', ['HttpRequestHelper', 'VolumeBrowserService', 'FileSaver', 'Blob', 'ModalService', 'Notifications',
 function (HttpRequestHelper, VolumeBrowserService, FileSaver, Blob, ModalService, Notifications) {
diff --git a/app/azure/services/resourceGroupService.js b/app/azure/services/resourceGroupService.js
index 1777edea8..f1532d283 100644
--- a/app/azure/services/resourceGroupService.js
+++ b/app/azure/services/resourceGroupService.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { ResourceGroupViewModel } from '../models/resource_group';
+
 angular.module('portainer.azure')
 .factory('ResourceGroupService', ['$q', 'ResourceGroup', function ResourceGroupServiceFactory($q, ResourceGroup) {
   'use strict';
diff --git a/app/docker/models/image.js b/app/docker/models/image.js
index fdb59a8ff..414e0b77d 100644
--- a/app/docker/models/image.js
+++ b/app/docker/models/image.js
@@ -23,7 +23,7 @@ export function ImageViewModel(data) {
   }
 }
 
-function ImageBuildModel(data) {
+export function ImageBuildModel(data) {
   this.hasError = false;
   var buildLogs = [];
 
diff --git a/app/docker/models/network.js b/app/docker/models/network.js
index e0dbb393b..35e419850 100644
--- a/app/docker/models/network.js
+++ b/app/docker/models/network.js
@@ -1,3 +1,5 @@
+import { ResourceControlViewModel } from "../../portainer/models/resourceControl";
+
 export function NetworkViewModel(data) {
   this.Id = data.Id;
   this.Name = data.Name;
diff --git a/app/docker/models/secret.js b/app/docker/models/secret.js
index c82fa9024..ccf098420 100644
--- a/app/docker/models/secret.js
+++ b/app/docker/models/secret.js
@@ -1,3 +1,5 @@
+import { ResourceControlViewModel } from '../../portainer/models/resourceControl'
+
 export function SecretViewModel(data) {
   this.Id = data.ID;
   this.CreatedAt = data.CreatedAt;
diff --git a/app/docker/models/volume.js b/app/docker/models/volume.js
index 7ebbc8731..0860031b2 100644
--- a/app/docker/models/volume.js
+++ b/app/docker/models/volume.js
@@ -1,3 +1,5 @@
+import { ResourceControlViewModel } from "../../portainer/models/resourceControl";
+
 export function VolumeViewModel(data) {
   this.Id = data.Name;
   this.Driver = data.Driver;
diff --git a/app/docker/services/buildService.js b/app/docker/services/buildService.js
index 60e7383cd..3300ba4db 100644
--- a/app/docker/services/buildService.js
+++ b/app/docker/services/buildService.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { ImageBuildModel } from "../models/image";
+
 angular.module('portainer.docker')
 .factory('BuildService', ['$q', 'Build', 'FileUploadService', function BuildServiceFactory($q, Build, FileUploadService) {
   'use strict';
diff --git a/app/docker/services/configService.js b/app/docker/services/configService.js
index 9063004a9..9200b7644 100644
--- a/app/docker/services/configService.js
+++ b/app/docker/services/configService.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { ConfigViewModel } from '../models/config';
+
 angular.module('portainer.docker')
 .factory('ConfigService', ['$q', 'Config', function ConfigServiceFactory($q, Config) {
   'use strict';
diff --git a/app/docker/services/containerService.js b/app/docker/services/containerService.js
index a9931667f..51d5b4113 100644
--- a/app/docker/services/containerService.js
+++ b/app/docker/services/containerService.js
@@ -1,5 +1,5 @@
 import angular from 'angular';
-import { ContainerDetailsViewModel, ContainerViewModel } from '../models/container';
+import { ContainerDetailsViewModel, ContainerViewModel, ContainerStatsViewModel } from '../models/container';
 
 angular.module('portainer.docker')
 .factory('ContainerService', ['$q', 'Container', 'ResourceControlService', 'LogHelper',
diff --git a/app/docker/services/nodeService.js b/app/docker/services/nodeService.js
index 5ebfeeee4..8acc1aa64 100644
--- a/app/docker/services/nodeService.js
+++ b/app/docker/services/nodeService.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { NodeViewModel } from '../models/node';
+
 angular.module('portainer.docker').factory('NodeService', [
   '$q', 'Node',
   function NodeServiceFactory($q, Node) {
diff --git a/app/docker/services/pluginService.js b/app/docker/services/pluginService.js
index ad73dee1c..35059617f 100644
--- a/app/docker/services/pluginService.js
+++ b/app/docker/services/pluginService.js
@@ -1,3 +1,7 @@
+import angular from 'angular';
+import _ from 'lodash';
+import { PluginViewModel } from "../models/plugin";
+
 angular.module('portainer.docker')
 .factory('PluginService', ['$q', 'Plugin', 'SystemService', function PluginServiceFactory($q, Plugin, SystemService) {
   'use strict';
diff --git a/app/docker/services/taskService.js b/app/docker/services/taskService.js
index 960b6bd70..36811b757 100644
--- a/app/docker/services/taskService.js
+++ b/app/docker/services/taskService.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { TaskViewModel } from '../models/task';
+
 angular.module('portainer.docker')
 .factory('TaskService', ['$q', 'Task', 'LogHelper',
 function TaskServiceFactory($q, Task, LogHelper) {
diff --git a/app/docker/views/containers/edit/containerController.js b/app/docker/views/containers/edit/containerController.js
index f687b116c..5f72258c9 100644
--- a/app/docker/views/containers/edit/containerController.js
+++ b/app/docker/views/containers/edit/containerController.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import moment from 'moment';
+
 angular.module('portainer.docker')
 .controller('ContainerController', ['$q', '$scope', '$state','$transition$', '$filter', 'Commit', 'ContainerHelper', 'ContainerService', 'ImageHelper', 'NetworkService', 'Notifications', 'ModalService', 'ResourceControlService', 'RegistryService', 'ImageService', 'HttpRequestHelper',
 function ($q, $scope, $state, $transition$, $filter, Commit, ContainerHelper, ContainerService, ImageHelper, NetworkService, Notifications, ModalService, ResourceControlService, RegistryService, ImageService, HttpRequestHelper) {
diff --git a/app/docker/views/events/eventsController.js b/app/docker/views/events/eventsController.js
index 5a35bb10a..c5952bee2 100644
--- a/app/docker/views/events/eventsController.js
+++ b/app/docker/views/events/eventsController.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import moment from 'moment';
+
 angular.module('portainer.docker')
 .controller('EventsController', ['$scope', 'Notifications', 'SystemService',
 function ($scope, Notifications, SystemService) {
diff --git a/app/docker/views/secrets/create/createSecretController.js b/app/docker/views/secrets/create/createSecretController.js
index 9b644d83a..d87e64011 100644
--- a/app/docker/views/secrets/create/createSecretController.js
+++ b/app/docker/views/secrets/create/createSecretController.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { AccessControlFormData } from '../../../../portainer/components/accessControlForm/porAccessControlFormModel';
+
 angular.module('portainer.docker')
 .controller('CreateSecretController', ['$scope', '$state', 'Notifications', 'SecretService', 'LabelHelper', 'Authentication', 'ResourceControlService', 'FormValidator',
 function ($scope, $state, Notifications, SecretService, LabelHelper, Authentication, ResourceControlService, FormValidator) {
diff --git a/app/extensions/storidge/models/node.js b/app/extensions/storidge/models/node.js
index e7e46e054..30f7aba88 100644
--- a/app/extensions/storidge/models/node.js
+++ b/app/extensions/storidge/models/node.js
@@ -1,4 +1,4 @@
-function StoridgeNodeModel(name, data) {
+export function StoridgeNodeModel(name, data) {
   this.Name = name;
   this.IP = data.ip;
   this.Role = data.role;
diff --git a/app/extensions/storidge/services/nodeService.js b/app/extensions/storidge/services/nodeService.js
index 386748ffb..d3374e351 100644
--- a/app/extensions/storidge/services/nodeService.js
+++ b/app/extensions/storidge/services/nodeService.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { StoridgeNodeModel } from '../models/node';
+
 angular.module('extension.storidge')
 .factory('StoridgeNodeService', ['$q', 'Storidge', function StoridgeNodeServiceFactory($q, Storidge) {
   'use strict';
diff --git a/app/extensions/storidge/views/monitor/monitorController.js b/app/extensions/storidge/views/monitor/monitorController.js
index d8dc5eda6..f6701f6a4 100644
--- a/app/extensions/storidge/views/monitor/monitorController.js
+++ b/app/extensions/storidge/views/monitor/monitorController.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import moment from 'moment';
+
 angular.module('extension.storidge')
 .controller('StoridgeMonitorController', ['$q', '$scope', '$interval', '$document', 'Notifications', 'StoridgeClusterService', 'StoridgeChartService',
 function ($q, $scope, $interval, $document, Notifications, StoridgeClusterService, StoridgeChartService) {
diff --git a/app/portainer/components/accessControlForm/porAccessControlFormModel.js b/app/portainer/components/accessControlForm/porAccessControlFormModel.js
index 1e973786f..d87602b9f 100644
--- a/app/portainer/components/accessControlForm/porAccessControlFormModel.js
+++ b/app/portainer/components/accessControlForm/porAccessControlFormModel.js
@@ -1,4 +1,4 @@
-function AccessControlFormData() {
+export function AccessControlFormData() {
   this.AccessControlEnabled = true;
   this.Ownership = 'private';
   this.AuthorizedUsers = [];
diff --git a/app/portainer/helpers/resourceControlHelper.js b/app/portainer/helpers/resourceControlHelper.js
index be668f5d6..d440d02db 100644
--- a/app/portainer/helpers/resourceControlHelper.js
+++ b/app/portainer/helpers/resourceControlHelper.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import _ from 'lodash';
+
 angular.module('portainer.app')
 .factory('ResourceControlHelper', [function ResourceControlHelperFactory() {
   'use strict';
diff --git a/app/portainer/models/teamMembership.js b/app/portainer/models/teamMembership.js
index 0d2454547..43aad6103 100644
--- a/app/portainer/models/teamMembership.js
+++ b/app/portainer/models/teamMembership.js
@@ -1,4 +1,4 @@
-function TeamMembershipModel(data) {
+export function TeamMembershipModel(data) {
   this.Id = data.Id;
   this.UserId = data.UserID;
   this.TeamId = data.TeamID;
diff --git a/app/portainer/models/template.js b/app/portainer/models/template.js
index b7f451d2b..43e446050 100644
--- a/app/portainer/models/template.js
+++ b/app/portainer/models/template.js
@@ -1,4 +1,6 @@
-function TemplateDefaultModel() {
+import _ from 'lodash';
+
+export function TemplateDefaultModel() {
   this.Type = 1;
   this.AdministratorOnly = false;
   this.Title = '';
@@ -46,7 +48,7 @@ function TemplateCreateRequest(model) {
   this.Volumes = model.Volumes;
 }
 
-function TemplateUpdateRequest(model) {
+export function TemplateUpdateRequest(model) {
   TemplateCreateRequest.call(this, model);
   this.id = model.Id;
 }
diff --git a/app/portainer/services/api/teamMembershipService.js b/app/portainer/services/api/teamMembershipService.js
index add4d6fca..c3772e4cd 100644
--- a/app/portainer/services/api/teamMembershipService.js
+++ b/app/portainer/services/api/teamMembershipService.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { TeamMembershipModel } from '../../models/teamMembership';
+
 angular.module('portainer.app')
 .factory('TeamMembershipService', ['$q', 'TeamMemberships', function TeamMembershipFactory($q, TeamMemberships) {
   'use strict';
diff --git a/app/portainer/views/stacks/edit/stackController.js b/app/portainer/views/stacks/edit/stackController.js
index 55eba59c4..a5e0d6598 100644
--- a/app/portainer/views/stacks/edit/stackController.js
+++ b/app/portainer/views/stacks/edit/stackController.js
@@ -1,3 +1,5 @@
+import angular from 'angular';
+
 angular.module('portainer.app')
 .controller('StackController', ['$q', '$scope', '$state', '$transition$', 'StackService', 'NodeService', 'ServiceService', 'TaskService', 'ContainerService', 'ServiceHelper', 'TaskHelper', 'Notifications', 'FormHelper', 'EndpointProvider', 'EndpointService', 'GroupService', 'ModalService',
 function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceService, TaskService, ContainerService, ServiceHelper, TaskHelper, Notifications, FormHelper, EndpointProvider, EndpointService, GroupService, ModalService) {
@@ -121,7 +123,7 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe
     var stack = $scope.stack;
 
     // TODO: this is a work-around for stacks created with Portainer version >= 1.17.1
-  	// The EndpointID property is not available for these stacks, we can pass
+    // The EndpointID property is not available for these stacks, we can pass
     // the current endpoint identifier as a part of the update request. It will be used if
     // the EndpointID property is not defined on the stack.
     var endpointId = EndpointProvider.endpointID();
@@ -239,7 +241,7 @@ function ($q, $scope, $state, $transition$, StackService, NodeService, ServiceSe
   function loadExternalStack(name) {
     var stackType = $transition$.params().type;
     if (!stackType || (stackType !== '1' && stackType !== '2')) {
-      Notifications.error('Failure', err, 'Invalid type URL parameter.');
+      Notifications.error('Failure', null, 'Invalid type URL parameter.');
       return;
     }
 
diff --git a/app/portainer/views/templates/create/createTemplateController.js b/app/portainer/views/templates/create/createTemplateController.js
index 57f6c577e..1fa0918fb 100644
--- a/app/portainer/views/templates/create/createTemplateController.js
+++ b/app/portainer/views/templates/create/createTemplateController.js
@@ -1,3 +1,6 @@
+import angular from 'angular';
+import { TemplateDefaultModel } from "../../../models/template";
+
 angular.module('portainer.app')
 .controller('CreateTemplateController', ['$q', '$scope', '$state', 'TemplateService', 'TemplateHelper', 'NetworkService', 'Notifications',
 function ($q, $scope, $state, TemplateService, TemplateHelper, NetworkService, Notifications) {
diff --git a/app/portainer/views/templates/templatesController.js b/app/portainer/views/templates/templatesController.js
index 948e54b3c..4afcdd819 100644
--- a/app/portainer/views/templates/templatesController.js
+++ b/app/portainer/views/templates/templatesController.js
@@ -1,3 +1,7 @@
+import angular from 'angular';
+import _ from 'lodash';
+import { AccessControlFormData } from '../../components/accessControlForm/porAccessControlFormModel';
+
 angular.module('portainer.app')
 .controller('TemplatesController', ['$scope', '$q', '$state', '$transition$', '$anchorScroll', 'ContainerService', 'ImageService', 'NetworkService', 'TemplateService', 'TemplateHelper', 'VolumeService', 'Notifications', 'ResourceControlService', 'Authentication', 'FormValidator', 'SettingsService', 'StackService', 'EndpointProvider', 'ModalService',
 function ($scope, $q, $state, $transition$, $anchorScroll, ContainerService, ImageService, NetworkService, TemplateService, TemplateHelper, VolumeService, Notifications, ResourceControlService, Authentication, FormValidator, SettingsService, StackService, EndpointProvider, ModalService) {