Additional fixes

Author: benmccann

src/index.js

@@ -3,16 +3,16 @@
  */
 import Chart from './core/core.controller';
 
-import helpers from './helpers';
+import helpers from './helpers/index';
 import _adapters from './core/core.adapters';
 import Animation from './core/core.animation';
 import Animator from './core/core.animator';
 import animationService from './core/core.animations';
-import controllers from './controllers';
+import controllers from './controllers/index';
 import DatasetController from './core/core.datasetController';
 import defaults from './core/core.defaults';
 import Element from './core/core.element';
-import elements from './elements';
+import elements from './elements/index';
 import Interaction from './core/core.interaction';
 import layouts from './core/core.layouts';
 import platforms from './platform/platforms';
@@ -42,17 +42,17 @@ Chart.scaleService = scaleService;
 Chart.Ticks = Ticks;
 
 // Register built-in scales
-import scales from './scales';
+import scales from './scales/index';
 Object.keys(scales).forEach(function(type) {
 	const scale = scales[type];
 	Chart.scaleService.registerScaleType(type, scale, scale._defaults);
 });
 
 // Load to register built-in adapters (as side effects)
-import './adapters';
+import './adapters/index';
 
 // Loading built-in plugins
-import plugins from './plugins';
+import plugins from './plugins/index';
 for (var k in plugins) {
 	if (Object.prototype.hasOwnProperty.call(plugins, k)) {
 		Chart.plugins.register(plugins[k]);

src/plugins/plugin.filler.js

@@ -10,7 +10,7 @@ import defaults from '../core/core.defaults';
 import Line from '../elements/element.line';
 import {_boundSegment, _boundSegments} from '../helpers/helpers.segment';
 import {clipArea, unclipArea} from '../helpers/helpers.canvas';
-import {valueOrDefault, isFinite, isArray, extend} from '../helpers/helpers.core';
+import {isArray, isFinite, valueOrDefault} from '../helpers/helpers.core';
 import {_normalizeAngle} from '../helpers/helpers.math';
 
 defaults._set('plugins', {
@@ -91,7 +91,9 @@ function computeLinearBoundary(source) {
 // TODO: use elements.Arc instead
 class simpleArc {
 	constructor(opts) {
-		extend(this, opts);
+		this.x = opts.x;
+		this.y = opts.y;
+		this.radius = opts.radius;
 	}
 
 	pathSegment(ctx, bounds, opts) {