1 files changed, 10 insertions, 9 deletions
diff --git a/src/main.js b/src/main.js
index 919fb25..8ea3e5d 100644
--- a/src/main.js
+++ b/src/main.js
@@ -7,7 +7,7 @@ import './modules/optional/memory.js'
 import './modules/optional/sugar.js'
 import './modules/optional/transform.js'
 
-import { extend } from './utils/adopter.js'
+import { extend, makeInstance } from './utils/adopter.js'
 import { getMethodNames, getMethodsFor } from './utils/methods.js'
 import Box from './types/Box.js'
 import Circle from './elements/Circle.js'
@@ -30,7 +30,7 @@ import Morphable, {
   TransformBag,
   makeMorphable,
   registerMorphableType
-} from './types/Morphable.js'
+} from './animation/Morphable.js'
 import Path from './elements/Path.js'
 import PathArray from './types/PathArray.js'
 import Pattern from './elements/Pattern.js'
@@ -43,9 +43,13 @@ import SVGArray from './types/SVGArray.js'
 import SVGNumber from './types/SVGNumber.js'
 import Shape from './elements/Shape.js'
 import Svg from './elements/Svg.js'
+import Symbol from './elements/Symbol.js'
 import Text from './elements/Text.js'
 import Tspan from './elements/Tspan.js'
 import * as defaults from './modules/core/defaults.js'
+import * as utils from './utils/utils.js'
+import * as namespaces from './modules/core/namespaces.js'
+import * as regex from './modules/core/regex.js'
 
 export {
   Morphable,
@@ -56,9 +60,8 @@ export {
   NonMorphable
 }
 
-export { defaults }
-export * from './utils/utils.js'
-export * from './modules/core/namespaces.js'
+export { defaults, utils, namespaces, regex }
+export const SVG = makeInstance
 export { default as parser } from './modules/core/parser.js'
 export { default as find } from './modules/core/selector.js'
 export * from './modules/core/event.js'
@@ -73,19 +76,18 @@ export { default as Runner } from './animation/Runner.js'
 export { default as Timeline } from './animation/Timeline.js'
 
 /* Types */
-export { default as SVGArray } from './types/SVGArray.js'
+export { default as Array } from './types/SVGArray.js'
 export { default as Box } from './types/Box.js'
 export { default as Color } from './types/Color.js'
 export { default as EventTarget } from './types/EventTarget.js'
 export { default as Matrix } from './types/Matrix.js'
-export { default as SVGNumber } from './types/SVGNumber.js'
+export { default as Number } from './types/SVGNumber.js'
 export { default as PathArray } from './types/PathArray.js'
 export { default as Point } from './types/Point.js'
 export { default as PointArray } from './types/PointArray.js'
 export { default as List } from './types/List.js'
 
 /* Elements */
-export { default as Bare } from './elements/Bare.js'
 export { default as Circle } from './elements/Circle.js'
 export { default as ClipPath } from './elements/ClipPath.js'
 export { default as Container } from './elements/Container.js'
@@ -95,7 +97,6 @@ export { default as Element } from './elements/Element.js'
 export { default as Ellipse } from './elements/Ellipse.js'
 export { default as Gradient } from './elements/Gradient.js'
 export { default as G } from './elements/G.js'
-export { default as HtmlNode } from './elements/HtmlNode.js'
 export { default as A } from './elements/A.js'
 export { default as Image } from './elements/Image.js'
 export { default as Line } from './elements/Line.js'