-import bar from './controller.bar';
-import bubble from './controller.bubble';
-import doughnut from './controller.doughnut';
-import horizontalBar from './controller.horizontalBar';
-import line from './controller.line';
-import polarArea from './controller.polarArea';
-import pie from './controller.pie';
-import radar from './controller.radar';
-import scatter from './controller.scatter';
-
-// NOTE export a map in which the key represents the controller type, not
-// the class, and so must be CamelCase in order to be correctly retrieved
-// by the controller in core.controller.js (`controllers[meta.type]`).
-
-export default {
- bar,
- bubble,
- doughnut,
- horizontalBar,
- line,
- polarArea,
- pie,
- radar,
- scatter
-};
+export {default as bar} from './controller.bar';
+export {default as bubble} from './controller.bubble';
+export {default as doughnut} from './controller.doughnut';
+export {default as horizontalBar} from './controller.horizontalBar';
+export {default as line} from './controller.line';
+export {default as polarArea} from './controller.polarArea';
+export {default as pie} from './controller.pie';
+export {default as radar} from './controller.radar';
+export {default as scatter} from './controller.scatter';
-import Animator from './core.animator';
-import controllers from '../controllers/index';
+/* eslint-disable import/no-namespace, import/namespace */
+import {default as Animator} from './core.animator';
+import * as controllers from '../controllers';
import defaults from './core.defaults';
import Interaction from './core.interaction';
import layouts from './core.layouts';
import helpers from './helpers/index';
import _adapters from './core/core.adapters';
import Animation from './core/core.animation';
-import Animator from './core/core.animator';
+import {default as Animator} from './core/core.animator';
import animationService from './core/core.animations';
-import controllers from './controllers/index';
+import * as controllers from './controllers';
import DatasetController from './core/core.datasetController';
import defaults from './core/core.defaults';
import Element from './core/core.element';