moved representations into mol-repr

README.md

@@ -19,9 +19,10 @@ The core of Mol* currently consists of these modules:
 - `mol-model` Data structures and algorithms (such as querying) for representing molecular data (including coordinate, experimental/map, and annotation data).
 - `mol-model-props` Common "custom properties".
 - `mol-script` A scriting language for creating representations/scenes and querying (includes the [MolQL query language](https://molql.github.io)).
-- `mol-geo` Creating molecular geometries.
+- `mol-geo` Creating (molecular) geometries.
 - `mol-theme` Molecular representation themeing.
-- `mol-gl` A lightweight wrapper around WebGL.
+- `mol-repr` Molecular representations.
+- `mol-gl` A wrapper around WebGL.
 - `mol-canvas3d` A low level 3d view component. Uses `mol-geo` to generate geometries.
 - `mol-state` State representation tree with state saving and automatic updates.
 - `mol-app` Components for builduing UIs.

package.json

@@ -52,17 +52,18 @@
       "mol-app($|/.*)": "<rootDir>/src/mol-app$1",
       "mol-data($|/.*)": "<rootDir>/src/mol-data$1",
       "mol-geo($|/.*)": "<rootDir>/src/mol-geo$1",
-      "mol-theme($|/.*)": "<rootDir>/src/mol-theme$1",
       "mol-gl($|/.*)": "<rootDir>/src/mol-gl$1",
       "mol-io($|/.*)": "<rootDir>/src/mol-io$1",
       "mol-math($|/.*)": "<rootDir>/src/mol-math$1",
       "mol-model($|/.*)": "<rootDir>/src/mol-model$1",
       "mol-model-props($|/.*)": "<rootDir>/src/mol-model-props$1",
+      "mol-plugin($|/.*)": "<rootDir>/src/mol-plugin$1",
       "mol-ql($|/.*)": "<rootDir>/src/mol-ql$1",
+      "mol-repr($|/.*)": "<rootDir>/src/mol-repr$1",
       "mol-script($|/.*)": "<rootDir>/src/mol-script$1",
-      "mol-task($|/.*)": "<rootDir>/src/mol-task$1",
       "mol-state($|/.*)": "<rootDir>/src/mol-state$1",
-      "mol-plugin($|/.*)": "<rootDir>/src/mol-plugin$1",
+      "mol-task($|/.*)": "<rootDir>/src/mol-task$1",
+      "mol-theme($|/.*)": "<rootDir>/src/mol-theme$1",
       "mol-util($|/.*)": "<rootDir>/src/mol-util$1",
       "mol-canvas3d($|/.*)": "<rootDir>/src/mol-canvas3d$1"
     },

src/apps/canvas/component/representation.tsx

@@ -8,7 +8,7 @@ import * as React from 'react'
 import Canvas3D from 'mol-canvas3d/canvas3d';
 import { App } from '../app';
 import { Params } from 'mol-util/parameter';
-import { Representation } from 'mol-geo/representation';
+import { Representation } from 'mol-repr';
 import { ParametersComponent } from 'mol-app/component/parameters';
 import { ColorTheme } from 'mol-theme/color';
 import { getColorThemeProps } from 'mol-geo/geometry/color-data';

src/apps/canvas/component/structure-view.tsx

@@ -6,9 +6,9 @@
 
 import * as React from 'react'
 import { StructureView } from '../structure-view';
-import { StructureRepresentation } from 'mol-geo/representation/structure';
 import { RepresentationComponent } from './representation';
-import { Representation } from 'mol-geo/representation';
+import { Representation } from 'mol-repr';
+import { StructureRepresentation } from 'mol-repr/structure/index';
 
 export interface StructureViewComponentProps {
     structureView: StructureView

src/apps/canvas/component/volume-view.tsx

@@ -6,9 +6,9 @@
 
 import * as React from 'react'
 import { RepresentationComponent } from './representation';
-import { Representation } from 'mol-geo/representation';
+import { Representation } from 'mol-repr';
 import { VolumeView } from '../volume-view';
-import { VolumeRepresentation } from 'mol-geo/representation/volume';
+import { VolumeRepresentation } from 'mol-repr/volume/index';
 
 export interface VolumeViewComponentProps {
     volumeView: VolumeView

src/apps/canvas/structure-view.ts

@@ -5,27 +5,27 @@
  */
 
 import { Model, Structure } from 'mol-model/structure';
-import { CartoonRepresentation } from 'mol-geo/representation/structure/representation/cartoon';
-import { BallAndStickRepresentation } from 'mol-geo/representation/structure/representation/ball-and-stick';
 import { getStructureFromModel } from './util';
 import { AssemblySymmetry } from 'mol-model-props/rcsb/symmetry';
-import { ShapeRepresentation, ShapeProps } from 'mol-geo/representation/shape';
 import { getAxesShape } from './assembly-symmetry';
 import Canvas3D from 'mol-canvas3d/canvas3d';
-import { CarbohydrateRepresentation } from 'mol-geo/representation/structure/representation/carbohydrate';
 // import { MeshBuilder } from 'mol-geo/mesh/mesh-builder';
 // import { addSphere } from 'mol-geo/mesh/builder/sphere';
 // import { Shape } from 'mol-model/shape';
 // import { Color } from 'mol-util/color';
 // import { computeUnitBoundary } from 'mol-model/structure/structure/util/boundary';
 // import { addBoundingBox } from 'mol-geo/mesh/builder/bounding-box';
-import { PointRepresentation } from 'mol-geo/representation/structure/representation/point';
-import { StructureRepresentation } from 'mol-geo/representation/structure';
 import { BehaviorSubject } from 'rxjs';
-import { SpacefillRepresentation } from 'mol-geo/representation/structure/representation/spacefill';
-import { DistanceRestraintRepresentation } from 'mol-geo/representation/structure/representation/distance-restraint';
-import { MolecularSurfaceRepresentation } from 'mol-geo/representation/structure/representation/molecular-surface';
 import { App } from './app';
+import { StructureRepresentation } from 'mol-repr/structure/index';
+import { ShapeRepresentation, ShapeProps } from 'mol-repr/shape/index';
+import { CartoonRepresentation } from 'mol-repr/structure/representation/cartoon';
+import { MolecularSurfaceRepresentation } from 'mol-repr/structure/representation/molecular-surface';
+import { PointRepresentation } from 'mol-repr/structure/representation/point';
+import { BallAndStickRepresentation } from 'mol-repr/structure/representation/ball-and-stick';
+import { CarbohydrateRepresentation } from 'mol-repr/structure/representation/carbohydrate';
+import { SpacefillRepresentation } from 'mol-repr/structure/representation/spacefill';
+import { DistanceRestraintRepresentation } from 'mol-repr/structure/representation/distance-restraint';
 
 export interface StructureView {
     readonly app: App

src/apps/canvas/volume-view.ts

@@ -8,9 +8,9 @@ import Canvas3D from 'mol-canvas3d/canvas3d';
 import { BehaviorSubject } from 'rxjs';
 import { App } from './app';
 import { VolumeData } from 'mol-model/volume';
-import { VolumeRepresentation } from 'mol-geo/representation/volume';
-import { IsosurfaceRepresentation } from 'mol-geo/representation/volume/isosurface-mesh';
-import { DirectVolumeRepresentation } from 'mol-geo/representation/volume/direct-volume';
+import { VolumeRepresentation } from 'mol-repr/volume/index';
+import { IsosurfaceRepresentation } from 'mol-repr/volume/isosurface-mesh';
+import { DirectVolumeRepresentation } from 'mol-repr/volume/direct-volume';
 
 export interface VolumeView {
     readonly app: App

src/apps/structure-info/volume.ts

@@ -13,9 +13,9 @@ import { downloadCif } from './helpers'
 import CIF from 'mol-io/reader/cif'
 import { DensityServer_Data_Database } from 'mol-io/reader/cif/schema/density-server';
 import { Table } from 'mol-data/db';
-import { createVolumeSurface } from 'mol-geo/representation/volume/isosurface-mesh';
 import { StringBuilder } from 'mol-util';
 import { Task } from 'mol-task';
+import { createVolumeSurface } from 'mol-repr/volume/isosurface-mesh';
 
 require('util.promisify').shim();
 const writeFileAsync = util.promisify(fs.writeFile);

src/mol-canvas3d/canvas3d.ts

@@ -16,7 +16,7 @@ import TrackballControls from './controls/trackball'
 import { Viewport } from './camera/util'
 import { resizeCanvas } from './util';
 import { createContext, getGLContext, WebGLContext } from 'mol-gl/webgl/context';
-import { Representation } from 'mol-geo/representation';
+import { Representation } from 'mol-repr';
 import { createRenderTarget } from 'mol-gl/webgl/render-target';
 import Scene from 'mol-gl/scene';
 import { RenderVariant } from 'mol-gl/webgl/render-item';

src/mol-plugin/state/objects.ts

@@ -7,7 +7,7 @@
 import { PluginStateObject } from './base';
 import { CifFile } from 'mol-io/reader/cif';
 import { Model as _Model, Structure as _Structure } from 'mol-model/structure'
-import { StructureRepresentation } from 'mol-geo/representation/structure';
+import { StructureRepresentation } from 'mol-repr/structure/index';
 
 const _create = PluginStateObject.Create
 

src/mol-plugin/state/transforms/visuals.ts

@@ -4,11 +4,11 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { CartoonRepresentation, DefaultCartoonProps } from 'mol-geo/representation/structure/representation/cartoon';
 import { Transformer } from 'mol-state';
 import { Task } from 'mol-task';
 import { PluginStateTransform } from '../base';
 import { PluginStateObjects as SO } from '../objects';
+import { CartoonRepresentation, DefaultCartoonProps } from 'mol-repr/structure/representation/cartoon';
 
 export const CreateStructureRepresentation = PluginStateTransform.Create<SO.Structure, SO.StructureRepresentation3D, { }>({
     name: 'create-structure-representation',

src/mol-geo/representation/index.ts → src/mol-repr/index.ts

@@ -6,9 +6,9 @@
 
 import { Task, RuntimeContext } from 'mol-task'
 import { RenderObject } from 'mol-gl/render-object'
-import { PickingId } from '../geometry/picking';
+import { PickingId } from '../mol-geo/geometry/picking';
 import { Loci } from 'mol-model/loci';
-import { MarkerAction } from '../geometry/marker-data';
+import { MarkerAction } from '../mol-geo/geometry/marker-data';
 import { Params } from 'mol-util/parameter';
 
 export interface RepresentationProps {}

src/mol-geo/representation/shape/index.ts → src/mol-repr/shape/index.ts

@@ -7,18 +7,18 @@
 import { Task } from 'mol-task'
 import { RenderObject, createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object';
 import { RepresentationProps, Representation } from '..';
-import { PickingId } from '../../geometry/picking';
 import { Loci, EmptyLoci, isEveryLoci } from 'mol-model/loci';
-import { MarkerAction, applyMarkerAction } from '../../geometry/marker-data';
 import { ValueCell } from 'mol-util';
 import { ColorThemeName, ColorThemeOptions } from 'mol-theme/color';
 import { Shape } from 'mol-model/shape';
-import { LocationIterator } from '../../util/location-iterator';
 import { OrderedSet, Interval } from 'mol-data/int';
-import { createIdentityTransform } from '../../geometry/transform-data';
-import { createRenderableState } from '../../geometry/geometry';
-import { Mesh } from '../../geometry/mesh/mesh';
 import { paramDefaultValues, SelectParam } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { createIdentityTransform } from 'mol-geo/geometry/transform-data';
+import { createRenderableState } from 'mol-geo/geometry/geometry';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction, applyMarkerAction } from 'mol-geo/geometry/marker-data';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
 
 export interface ShapeRepresentation<P extends RepresentationProps = {}> extends Representation<Shape, P> { }
 

src/mol-geo/representation/structure/complex-representation.ts → src/mol-repr/structure/complex-representation.ts

@@ -7,11 +7,11 @@
 
 import { Structure } from 'mol-model/structure';
 import { Task } from 'mol-task'
-import { PickingId } from '../../geometry/picking';
 import { Loci, EmptyLoci } from 'mol-model/loci';
-import { MarkerAction } from '../../geometry/marker-data';
-import { StructureProps, StructureRepresentation, StructureParams } from '.';
+import { StructureProps, StructureRepresentation, StructureParams } from './index';
 import { ComplexVisual } from './complex-visual';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
 
 export function ComplexRepresentation<P extends StructureProps>(label: string, visualCtor: () => ComplexVisual<P>): StructureRepresentation<P> {
     let visual: ComplexVisual<P> | undefined

src/mol-geo/representation/structure/complex-visual.ts → src/mol-repr/structure/complex-visual.ts

@@ -7,21 +7,21 @@
 import { Structure } from 'mol-model/structure';
 import { Visual } from '..';
 import { MeshRenderObject, LinesRenderObject, PointsRenderObject, DirectVolumeRenderObject } from 'mol-gl/render-object';
-import { Mesh } from '../../geometry/mesh/mesh';
 import { RuntimeContext } from 'mol-task';
-import { LocationIterator } from '../../util/location-iterator';
 import { createComplexMeshRenderObject, sizeChanged, colorChanged, UnitKind, UnitKindOptions } from './visual/util/common';
-import { StructureProps, VisualUpdateState, StructureMeshParams, StructureParams } from '.';
+import { StructureProps, VisualUpdateState, StructureMeshParams, StructureParams } from './index';
 import { deepEqual, ValueCell } from 'mol-util';
-import { PickingId } from '../../geometry/picking';
 import { Loci, isEveryLoci, EmptyLoci } from 'mol-model/loci';
-import { MarkerAction, applyMarkerAction } from '../../geometry/marker-data';
 import { Interval } from 'mol-data/int';
-import { updateRenderableState, Geometry } from '../../geometry/geometry';
-import { createColors } from '../../geometry/color-data';
 import { MultiSelectParam, paramDefaultValues } from 'mol-util/parameter';
 import { RenderableValues } from 'mol-gl/renderable/schema';
 import { createSizes } from 'mol-geo/geometry/size-data';
+import { Geometry, updateRenderableState } from 'mol-geo/geometry/geometry';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { createColors } from 'mol-geo/geometry/color-data';
+import { MarkerAction, applyMarkerAction } from 'mol-geo/geometry/marker-data';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
 
 export interface  ComplexVisual<P extends StructureProps> extends Visual<Structure, P> { }
 

src/mol-geo/representation/structure/index.ts → src/mol-repr/structure/index.ts

@@ -9,15 +9,18 @@ import { Structure } from 'mol-model/structure';
 import { ColorThemeName, ColorThemeOptions } from 'mol-theme/color';
 import { SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
 import { Representation, RepresentationProps } from '..';
-import { Geometry } from '../../geometry/geometry';
-import { Mesh } from '../../geometry/mesh/mesh';
-import { Points } from '../../geometry/points/points';
-import { Lines } from '../../geometry/lines/lines';
 import { SelectParam, paramDefaultValues } from 'mol-util/parameter';
-import { DirectVolume } from '../../geometry/direct-volume/direct-volume';
+import { Geometry } from 'mol-geo/geometry/geometry';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { Points } from 'mol-geo/geometry/points/points';
+import { Lines } from 'mol-geo/geometry/lines/lines';
+import { DirectVolume } from 'mol-geo/geometry/direct-volume/direct-volume';
 
 export interface StructureRepresentation<P extends RepresentationProps = {}> extends Representation<Structure, P> { }
 
+// export interface  StructureVisual<P extends RepresentationProps = {}> extends Visual<Structure, P> { }
+
+
 export const StructureParams = {
     ...Geometry.Params,
     colorTheme: SelectParam<ColorThemeName>('Color Theme', '', 'polymer-index', ColorThemeOptions),

src/mol-geo/representation/structure/representation/backbone.ts → src/mol-repr/structure/representation/backbone.ts

@@ -4,15 +4,16 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { StructureRepresentation, UnitsRepresentation } from '..';
-import { PickingId } from '../../../geometry/picking';
 import { Structure } from 'mol-model/structure';
 import { Task } from 'mol-task';
 import { Loci } from 'mol-model/loci';
-import { MarkerAction } from '../../../geometry/marker-data';
 import { PolymerBackboneVisual, PolymerBackboneParams } from '../visual/polymer-backbone-cylinder';
 import { getQualityProps } from '../../util';
 import { paramDefaultValues } from 'mol-util/parameter';
+import { UnitsRepresentation } from '../units-representation';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { StructureRepresentation } from '../index';
 
 export const BackboneParams = {
     ...PolymerBackboneParams

src/mol-geo/representation/structure/representation/ball-and-stick.ts → src/mol-repr/structure/representation/ball-and-stick.ts

@@ -4,19 +4,21 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { ComplexRepresentation, StructureRepresentation, UnitsRepresentation } from '..';
 import { ElementSphereVisual, ElementSphereParams } from '../visual/element-sphere';
 import { IntraUnitLinkVisual, IntraUnitLinkParams } from '../visual/intra-unit-link-cylinder';
-import { PickingId } from '../../../geometry/picking';
 import { Structure } from 'mol-model/structure';
 import { Task } from 'mol-task';
 import { Loci, isEmptyLoci } from 'mol-model/loci';
-import { MarkerAction } from '../../../geometry/marker-data';
 import { InterUnitLinkVisual } from '../visual/inter-unit-link-cylinder';
 import { SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
 import { getQualityProps } from '../../util';
 import { paramDefaultValues, SelectParam, NumberParam, MultiSelectParam } from 'mol-util/parameter';
 import { UnitKind, UnitKindOptions } from '../visual/util/common';
+import { UnitsRepresentation } from '../units-representation';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { ComplexRepresentation } from '../complex-representation';
+import { StructureRepresentation } from '../index';
 
 export const BallAndStickParams = {
     ...ElementSphereParams,

src/mol-geo/representation/structure/representation/carbohydrate.ts → src/mol-repr/structure/representation/carbohydrate.ts

@@ -4,17 +4,18 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { ComplexRepresentation, StructureRepresentation } from '..';
-import { PickingId } from '../../../geometry/picking';
 import { Structure } from 'mol-model/structure';
 import { Task } from 'mol-task';
 import { Loci, isEmptyLoci } from 'mol-model/loci';
-import { MarkerAction } from '../../../geometry/marker-data';
 import { CarbohydrateSymbolVisual, CarbohydrateSymbolParams } from '../visual/carbohydrate-symbol-mesh';
 import { CarbohydrateLinkVisual, CarbohydrateLinkParams } from '../visual/carbohydrate-link-cylinder';
 import { SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
 import { getQualityProps } from '../../util';
 import { paramDefaultValues, SelectParam, NumberParam } from 'mol-util/parameter';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { ComplexRepresentation } from '../complex-representation';
+import { StructureRepresentation } from '../index';
 
 export const CarbohydrateParams = {
     ...CarbohydrateSymbolParams,

src/mol-geo/representation/structure/representation/cartoon.ts → src/mol-repr/structure/representation/cartoon.ts

@@ -4,18 +4,19 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { StructureRepresentation, UnitsRepresentation } from '..';
-import { PickingId } from '../../../geometry/picking';
 import { Structure } from 'mol-model/structure';
 import { Task } from 'mol-task';
 import { Loci, isEmptyLoci } from 'mol-model/loci';
-import { MarkerAction } from '../../../geometry/marker-data';
 import { PolymerTraceVisual,  PolymerTraceParams } from '../visual/polymer-trace-mesh';
 import { PolymerGapVisual, PolymerGapParams } from '../visual/polymer-gap-cylinder';
 import { NucleotideBlockVisual, NucleotideBlockParams } from '../visual/nucleotide-block-mesh';
 import { SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
 import { getQualityProps } from '../../util';
 import { paramDefaultValues, SelectParam, NumberParam } from 'mol-util/parameter';
+import { UnitsRepresentation } from '../units-representation';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { StructureRepresentation } from '../index';
 // import { PolymerDirectionVisual, DefaultPolymerDirectionProps } from '../visual/polymer-direction-wedge';
 
 export const CartoonParams = {

src/mol-geo/representation/structure/representation/distance-restraint.ts → src/mol-repr/structure/representation/distance-restraint.ts

@@ -4,16 +4,17 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { ComplexRepresentation, StructureRepresentation } from '..';
-import { PickingId } from '../../../geometry/picking';
 import { Structure } from 'mol-model/structure';
 import { Task } from 'mol-task';
 import { Loci } from 'mol-model/loci';
-import { MarkerAction } from '../../../geometry/marker-data';
 import { CrossLinkRestraintVisual, CrossLinkRestraintParams } from '../visual/cross-link-restraint-cylinder';
 import { SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
 import { getQualityProps } from '../../util';
 import { paramDefaultValues, SelectParam, NumberParam } from 'mol-util/parameter';
+import { ComplexRepresentation } from '../complex-representation';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { StructureRepresentation } from '../index';
 
 export const DistanceRestraintParams = {
     ...CrossLinkRestraintParams,

src/mol-geo/representation/structure/representation/molecular-surface.ts → src/mol-repr/structure/representation/molecular-surface.ts

@@ -4,19 +4,19 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { UnitsRepresentation } from '..';
 import { GaussianSurfaceVisual, GaussianSurfaceParams } from '../visual/gaussian-surface-mesh';
-import { StructureRepresentation } from '../units-representation';
+import { UnitsRepresentation } from '../units-representation';
 import { Structure } from 'mol-model/structure';
-import { MarkerAction } from '../../../geometry/marker-data';
 import { Loci, isEmptyLoci } from 'mol-model/loci';
-import { PickingId } from '../../../geometry/picking';
 import { Task } from 'mol-task';
 import { GaussianWireframeVisual, GaussianWireframeParams } from '../visual/gaussian-surface-wireframe';
 import { getQualityProps } from '../../util';
 import { paramDefaultValues, MultiSelectParam, SelectParam } from 'mol-util/parameter';
 import { GaussianDensityVolumeParams, GaussianDensityVolumeVisual } from '../visual/gaussian-density-volume';
 import { SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { StructureRepresentation } from '../index';
 
 const VisualOptions = [['surface', 'Surface'], ['wireframe', 'Wireframe'], ['volume', 'Volume']] as [string, string][]
 

src/mol-geo/representation/structure/representation/point.ts → src/mol-repr/structure/representation/point.ts

@@ -4,14 +4,14 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { UnitsRepresentation } from '..';
 import { ElementPointVisual, ElementPointParams } from '../visual/element-point';
-import { StructureRepresentation } from '../units-representation';
+import { UnitsRepresentation } from '../units-representation';
 import { Structure } from 'mol-model/structure';
-import { MarkerAction } from '../../../geometry/marker-data';
 import { Loci } from 'mol-model/loci';
-import { PickingId } from '../../../geometry/picking';
 import { paramDefaultValues } from 'mol-util/parameter';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { StructureRepresentation } from '../index';
 
 export const PointParams = {
     ...ElementPointParams,

src/mol-geo/representation/structure/representation/spacefill.ts → src/mol-repr/structure/representation/spacefill.ts

@@ -4,15 +4,15 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import { UnitsRepresentation } from '..';
 import { ElementSphereVisual, ElementSphereParams } from '../visual/element-sphere';
-import { StructureRepresentation } from '../units-representation';
+import { UnitsRepresentation } from '../units-representation';
 import { Structure } from 'mol-model/structure';
-import { PickingId } from '../../../geometry/picking';
-import { MarkerAction } from '../../../geometry/marker-data';
 import { Loci } from 'mol-model/loci';
 import { getQualityProps } from '../../util';
 import { paramDefaultValues } from 'mol-util/parameter';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
+import { StructureRepresentation } from '../index';
 
 export const SpacefillParams = {
     ...ElementSphereParams

src/mol-geo/representation/structure/units-representation.ts → src/mol-repr/structure/units-representation.ts

@@ -8,17 +8,14 @@
 import { Structure, Unit } from 'mol-model/structure';
 import { Task } from 'mol-task'
 import { RenderObject } from 'mol-gl/render-object';
-import { Representation, RepresentationProps, Visual } from '..';
-import { PickingId } from '../../geometry/picking';
+import { RepresentationProps, Visual } from '..';
 import { Loci, EmptyLoci, isEmptyLoci } from 'mol-model/loci';
-import { MarkerAction } from '../../geometry/marker-data';
-import { StructureProps, StructureParams } from '.';
 import { StructureGroup } from './units-visual';
+import { StructureProps, StructureParams, StructureRepresentation } from './index';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
 
 export interface UnitsVisual<P extends RepresentationProps = {}> extends Visual<StructureGroup, P> { }
-export interface  StructureVisual<P extends RepresentationProps = {}> extends Visual<Structure, P> { }
-
-export interface StructureRepresentation<P extends RepresentationProps = {}> extends Representation<Structure, P> { }
 
 export function UnitsRepresentation<P extends StructureProps>(label: string, visualCtor: () => UnitsVisual<P>): StructureRepresentation<P> {
     let visuals = new Map<number, { group: Unit.SymmetryGroup, visual: UnitsVisual<P> }>()

src/mol-geo/representation/structure/units-visual.ts → src/mol-repr/structure/units-visual.ts

@@ -6,25 +6,25 @@
 
 import { Unit, Structure } from 'mol-model/structure';
 import { RepresentationProps, Visual } from '../';
-import { VisualUpdateState, StructureMeshParams, StructurePointsParams, StructureLinesParams, StructureDirectVolumeParams, StructureParams } from '.';
+import { VisualUpdateState, StructureMeshParams, StructurePointsParams, StructureLinesParams, StructureDirectVolumeParams, StructureParams } from './index';
 import { RuntimeContext } from 'mol-task';
-import { PickingId } from '../../geometry/picking';
-import { LocationIterator } from '../../util/location-iterator';
-import { Mesh } from '../../geometry/mesh/mesh';
-import { MarkerAction, applyMarkerAction, createMarkers } from '../../geometry/marker-data';
 import { Loci, isEveryLoci, EmptyLoci } from 'mol-model/loci';
 import { MeshRenderObject, PointsRenderObject, LinesRenderObject, DirectVolumeRenderObject } from 'mol-gl/render-object';
 import { createUnitsMeshRenderObject, createUnitsPointsRenderObject, createUnitsTransform, createUnitsLinesRenderObject, createUnitsDirectVolumeRenderObject, UnitKind, UnitKindOptions, includesUnitKind, colorChanged, sizeChanged } from './visual/util/common';
 import { deepEqual, ValueCell, UUID } from 'mol-util';
 import { Interval } from 'mol-data/int';
-import { Points } from '../../geometry/points/points';
-import { updateRenderableState, Geometry } from '../../geometry/geometry';
-import { createColors } from '../../geometry/color-data';
-import { createSizes } from '../../geometry/size-data';
-import { Lines } from '../../geometry/lines/lines';
 import { MultiSelectParam, paramDefaultValues } from 'mol-util/parameter';
-import { DirectVolume } from '../../geometry/direct-volume/direct-volume';
 import { RenderableValues } from 'mol-gl/renderable/schema';
+import { Geometry, updateRenderableState } from 'mol-geo/geometry/geometry';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { createMarkers, MarkerAction, applyMarkerAction } from 'mol-geo/geometry/marker-data';
+import { createSizes } from 'mol-geo/geometry/size-data';
+import { createColors } from 'mol-geo/geometry/color-data';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { Points } from 'mol-geo/geometry/points/points';
+import { Lines } from 'mol-geo/geometry/lines/lines';
+import { DirectVolume } from 'mol-geo/geometry/direct-volume/direct-volume';
 
 export type StructureGroup = { structure: Structure, group: Unit.SymmetryGroup }
 

src/mol-geo/representation/structure/visual/carbohydrate-link-cylinder.ts → src/mol-repr/structure/visual/carbohydrate-link-cylinder.ts

@@ -5,21 +5,21 @@
  */
 
 import { Structure, Link, StructureElement } from 'mol-model/structure';
-import { ComplexVisual, VisualUpdateState } from '..';
 import { RuntimeContext } from 'mol-task'
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { PickingId } from '../../../geometry/picking';
 import { Loci, EmptyLoci } from 'mol-model/loci';
 import { Vec3 } from 'mol-math/linear-algebra';
-import { LocationIterator } from '../../../util/location-iterator';
 import { createLinkCylinderMesh, LinkCylinderProps, LinkCylinderParams } from './util/link';
 import { OrderedSet, Interval } from 'mol-data/int';
-import { ComplexMeshVisual } from '../complex-visual';
+import { ComplexMeshVisual, ComplexVisual } from '../complex-visual';
 import { SizeTheme, SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
 import { LinkType } from 'mol-model/structure/model/types';
 import { BitFlags } from 'mol-util';
 import { UnitsMeshParams } from '../units-visual';
 import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { VisualUpdateState } from '../index';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { PickingId } from 'mol-geo/geometry/picking';
 
 // TODO create seperate visual
 // for (let i = 0, il = carbohydrates.terminalLinks.length; i < il; ++i) {

src/mol-geo/representation/structure/visual/carbohydrate-symbol-mesh.ts → src/mol-repr/structure/visual/carbohydrate-symbol-mesh.ts

@@ -4,26 +4,26 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
+import { Mat4, Vec3 } from 'mol-math/linear-algebra';
+import { Box, PerforatedBox } from 'mol-geo/primitive/box';
+import { OctagonalPyramid, PerforatedOctagonalPyramid } from 'mol-geo/primitive/pyramid';
+import { Star } from 'mol-geo/primitive/star';
+import { Octahedron, PerforatedOctahedron } from 'mol-geo/primitive/octahedron';
+import { DiamondPrism, PentagonalPrism, HexagonalPrism } from 'mol-geo/primitive/prism';
+import { RuntimeContext } from 'mol-task';
 import { Structure, StructureElement } from 'mol-model/structure';
-import { ComplexVisual, VisualUpdateState } from '..';
-import { RuntimeContext } from 'mol-task'
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { PickingId } from '../../../geometry/picking';
-import { Loci, EmptyLoci } from 'mol-model/loci';
-import { MeshBuilder } from '../../../geometry/mesh/mesh-builder';
-import { Vec3, Mat4 } from 'mol-math/linear-algebra';
-import { getSaccharideShape, SaccharideShapes } from 'mol-model/structure/structure/carbohydrates/constants';
-import { LocationIterator } from '../../../util/location-iterator';
-import { OrderedSet, Interval } from 'mol-data/int';
-import { ComplexMeshVisual, ComplexMeshParams } from '../complex-visual';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder';
 import { SizeTheme, SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
-import { addSphere } from '../../../geometry/mesh/builder/sphere';
-import { Box, PerforatedBox } from '../../../primitive/box';
-import { OctagonalPyramid, PerforatedOctagonalPyramid } from '../../../primitive/pyramid';
-import { Star } from '../../../primitive/star';
-import { Octahedron, PerforatedOctahedron } from '../../../primitive/octahedron';
-import { DiamondPrism, PentagonalPrism, HexagonalPrism } from '../../../primitive/prism';
+import { getSaccharideShape, SaccharideShapes } from 'mol-model/structure/structure/carbohydrates/constants';
+import { addSphere } from 'mol-geo/geometry/mesh/builder/sphere';
+import { ComplexMeshParams, ComplexMeshVisual } from '../complex-visual';
 import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
+import { ComplexVisual, VisualUpdateState } from '../index';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { OrderedSet, Interval } from 'mol-data/int';
+import { EmptyLoci, Loci } from 'mol-model/loci';
 
 const t = Mat4.identity()
 const sVec = Vec3.zero()

src/mol-geo/representation/structure/visual/cross-link-restraint-cylinder.ts → src/mol-repr/structure/visual/cross-link-restraint-cylinder.ts

@@ -5,20 +5,20 @@
  */
 
 import { Link, Structure, StructureElement } from 'mol-model/structure';
-import { ComplexVisual, VisualUpdateState } from '..';
+import { ComplexVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
 import { LinkCylinderProps, createLinkCylinderMesh, LinkCylinderParams } from './util/link';
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { PickingId } from '../../../geometry/picking';
 import { Vec3 } from 'mol-math/linear-algebra';
 import { Loci, EmptyLoci } from 'mol-model/loci';
 import { ComplexMeshVisual, ComplexMeshParams } from '../complex-visual';
-import { LocationIterator } from '../../../util/location-iterator';
 import { Interval } from 'mol-data/int';
 import { SizeTheme, SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
 import { BitFlags } from 'mol-util';
 import { LinkType } from 'mol-model/structure/model/types';
 import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { PickingId } from 'mol-geo/geometry/picking';
 
 async function createCrossLinkRestraintCylinderMesh(ctx: RuntimeContext, structure: Structure, props: LinkCylinderProps, mesh?: Mesh) {
 

src/mol-geo/representation/structure/visual/element-point.ts → src/mol-repr/structure/visual/element-point.ts

@@ -6,14 +6,14 @@
 
 import { Unit, Structure } from 'mol-model/structure';
 import { RuntimeContext } from 'mol-task'
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { getElementLoci, StructureElementIterator, markElement } from './util/element';
 import { Vec3 } from 'mol-math/linear-algebra';
 import { SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
 import { UnitsPointsVisual, UnitsPointsParams } from '../units-visual';
-import { Points } from '../../../geometry/points/points';
-import { PointsBuilder } from '../../../geometry/points/points-builder';
 import { SelectParam, NumberParam, BooleanParam, paramDefaultValues } from 'mol-util/parameter';
+import { Points } from 'mol-geo/geometry/points/points';
+import { PointsBuilder } from 'mol-geo/geometry/points/points-builder';
 
 export const ElementPointParams = {
     ...UnitsPointsParams,

src/mol-geo/representation/structure/visual/element-sphere.ts → src/mol-repr/structure/visual/element-sphere.ts

@@ -5,7 +5,7 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { createElementSphereMesh, markElement, getElementLoci, StructureElementIterator } from './util/element';
 import { UnitsMeshVisual, UnitsMeshParams } from '../units-visual';
 import { NumberParam, paramDefaultValues, SelectParam } from 'mol-util/parameter';

src/mol-geo/representation/structure/visual/gaussian-density-point.ts → src/mol-repr/structure/visual/gaussian-density-point.ts

@@ -6,16 +6,16 @@
 
 import { Unit, Structure } from 'mol-model/structure';
 import { RuntimeContext } from 'mol-task'
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { StructureElementIterator } from './util/element';
 import { EmptyLoci } from 'mol-model/loci';
 import { Vec3 } from 'mol-math/linear-algebra';
 import { UnitsPointsVisual, UnitsPointsParams } from '../units-visual';
-import { Points } from '../../../geometry/points/points';
-import { PointsBuilder } from '../../../geometry/points/points-builder';
 import { SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
 import { GaussianDensityProps, GaussianDensityParams } from 'mol-model/structure/structure/unit/gaussian-density';
 import { paramDefaultValues, SelectParam, NumberParam, BooleanParam } from 'mol-util/parameter';
+import { Points } from 'mol-geo/geometry/points/points';
+import { PointsBuilder } from 'mol-geo/geometry/points/points-builder';
 
 export const GaussianDensityPointParams = {
     ...UnitsPointsParams,

src/mol-geo/representation/structure/visual/gaussian-density-volume.ts → src/mol-repr/structure/visual/gaussian-density-volume.ts

@@ -5,13 +5,13 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
 import { UnitsDirectVolumeVisual, UnitsDirectVolumeParams } from '../units-visual';
 import { StructureElementIterator, getElementLoci, markElement } from './util/element';
 import { GaussianDensityProps, GaussianDensityParams, computeUnitGaussianDensityTexture } from 'mol-model/structure/structure/unit/gaussian-density';
 import { paramDefaultValues } from 'mol-util/parameter';
-import { DirectVolume } from '../../../geometry/direct-volume/direct-volume';
+import { DirectVolume } from 'mol-geo/geometry/direct-volume/direct-volume';
 
 async function createGaussianDensityVolume(ctx: RuntimeContext, unit: Unit, structure: Structure, props: GaussianDensityProps, directVolume?: DirectVolume): Promise<DirectVolume> {
     const { webgl } = props

src/mol-geo/representation/structure/visual/gaussian-surface-mesh.ts → src/mol-repr/structure/visual/gaussian-surface-mesh.ts

@@ -5,14 +5,14 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { Mesh } from '../../../geometry/mesh/mesh';
 import { UnitsMeshVisual, UnitsMeshParams } from '../units-visual';
 import { StructureElementIterator, getElementLoci, markElement } from './util/element';
-import { computeMarchingCubesMesh } from '../../../util/marching-cubes/algorithm';
 import { GaussianDensityProps, GaussianDensityParams } from 'mol-model/structure/structure/unit/gaussian-density';
 import { paramDefaultValues } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { computeMarchingCubesMesh } from 'mol-geo/util/marching-cubes/algorithm';
 
 async function createGaussianSurfaceMesh(ctx: RuntimeContext, unit: Unit, structure: Structure, props: GaussianDensityProps, mesh?: Mesh): Promise<Mesh> {
     const { smoothness } = props

src/mol-geo/representation/structure/visual/gaussian-surface-wireframe.ts → src/mol-repr/structure/visual/gaussian-surface-wireframe.ts

@@ -5,15 +5,15 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
 import { UnitsLinesVisual, UnitsLinesParams } from '../units-visual';
 import { StructureElementIterator, getElementLoci, markElement } from './util/element';
-import { computeMarchingCubesLines } from '../../../util/marching-cubes/algorithm';
-import { Lines } from '../../../geometry/lines/lines';
 import { GaussianDensityProps, GaussianDensityParams } from 'mol-model/structure/structure/unit/gaussian-density';
 import { paramDefaultValues, SelectParam, NumberParam, BooleanParam } from 'mol-util/parameter';
 import { SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
+import { Lines } from 'mol-geo/geometry/lines/lines';
+import { computeMarchingCubesLines } from 'mol-geo/util/marching-cubes/algorithm';
 
 async function createGaussianWireframe(ctx: RuntimeContext, unit: Unit, structure: Structure, props: GaussianDensityProps, lines?: Lines): Promise<Lines> {
     const { smoothness } = props

src/mol-geo/representation/structure/visual/inter-unit-link-cylinder.ts → src/mol-repr/structure/visual/inter-unit-link-cylinder.ts

@@ -5,11 +5,9 @@
  */
 
 import { Link, Structure, StructureElement } from 'mol-model/structure';
-import { ComplexVisual, VisualUpdateState } from '..';
+import { ComplexVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
 import { LinkCylinderProps, createLinkCylinderMesh, LinkIterator, LinkCylinderParams } from './util/link';
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { PickingId } from '../../../geometry/picking';
 import { Vec3 } from 'mol-math/linear-algebra';
 import { Loci, EmptyLoci } from 'mol-model/loci';
 import { ComplexMeshVisual, ComplexMeshParams } from '../complex-visual';
@@ -17,6 +15,8 @@ import { Interval } from 'mol-data/int';
 import { SizeTheme, SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
 import { BitFlags } from 'mol-util';
 import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { PickingId } from 'mol-geo/geometry/picking';
 
 async function createInterUnitLinkCylinderMesh(ctx: RuntimeContext, structure: Structure, props: LinkCylinderProps, mesh?: Mesh) {
     const links = structure.links

src/mol-geo/representation/structure/visual/intra-unit-link-cylinder.ts → src/mol-repr/structure/visual/intra-unit-link-cylinder.ts

@@ -6,11 +6,9 @@
  */
 
 import { Unit, Link, StructureElement, Structure } from 'mol-model/structure';
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
 import { LinkCylinderProps, createLinkCylinderMesh, LinkIterator, LinkCylinderParams } from './util/link';
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { PickingId } from '../../../geometry/picking';
 import { Vec3 } from 'mol-math/linear-algebra';
 import { Loci, EmptyLoci } from 'mol-model/loci';
 import { UnitsMeshVisual, UnitsMeshParams } from '../units-visual';
@@ -18,6 +16,8 @@ import { Interval } from 'mol-data/int';
 import { SizeTheme, SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
 import { BitFlags } from 'mol-util';
 import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { PickingId } from 'mol-geo/geometry/picking';
 
 async function createIntraUnitLinkCylinderMesh(ctx: RuntimeContext, unit: Unit, structure: Structure, props: LinkCylinderProps, mesh?: Mesh) {
     if (!Unit.isAtomic(unit)) return Mesh.createEmpty(mesh)

src/mol-geo/representation/structure/visual/nucleotide-block-mesh.ts → src/mol-repr/structure/visual/nucleotide-block-mesh.ts

@@ -5,19 +5,19 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { UnitsVisual } from '..';
+import { UnitsVisual } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { MeshBuilder } from '../../../geometry/mesh/mesh-builder';
 import { Vec3, Mat4 } from 'mol-math/linear-algebra';
 import { Segmentation } from 'mol-data/int';
 import { MoleculeType, isNucleic, isPurinBase, isPyrimidineBase } from 'mol-model/structure/model/types';
 import { getElementIndexForAtomRole } from 'mol-model/structure/util';
 import { UnitsMeshVisual, UnitsMeshParams } from '../units-visual';
-import { addCylinder } from '../../../geometry/mesh/builder/cylinder';
-import { Box } from '../../../primitive/box';
 import { NucleotideLocationIterator, markNucleotideElement, getNucleotideElementLoci } from './util/nucleotide';
 import { paramDefaultValues } from 'mol-util/parameter';
+import { Box } from 'mol-geo/primitive/box';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder';
+import { addCylinder } from 'mol-geo/geometry/mesh/builder/cylinder';
 
 const p1 = Vec3.zero()
 const p2 = Vec3.zero()

src/mol-geo/representation/structure/visual/polymer-backbone-cylinder.ts → src/mol-repr/structure/visual/polymer-backbone-cylinder.ts

@@ -5,19 +5,19 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { MeshBuilder } from '../../../geometry/mesh/mesh-builder';
 import { PolymerBackboneIterator } from './util/polymer';
 import { getElementLoci, markElement, StructureElementIterator } from './util/element';
 import { Vec3 } from 'mol-math/linear-algebra';
 import { UnitsMeshVisual, UnitsMeshParams } from '../units-visual';
 import { SizeTheme, SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
-import { CylinderProps } from '../../../primitive/cylinder';
 import { OrderedSet } from 'mol-data/int';
-import { addCylinder } from '../../../geometry/mesh/builder/cylinder';
 import { paramDefaultValues, NumberParam, SelectParam } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder';
+import { CylinderProps } from 'mol-geo/primitive/cylinder';
+import { addCylinder } from 'mol-geo/geometry/mesh/builder/cylinder';
 
 export const PolymerBackboneCylinderParams = {
     sizeTheme: SelectParam<SizeThemeName>('Size Theme', '', 'uniform', SizeThemeOptions),

src/mol-repr/structure/visual/polymer-backbone-sphere.ts

@@ -0,0 +1 @@
+// TODO

src/mol-geo/representation/structure/visual/polymer-direction-wedge.ts → src/mol-repr/structure/visual/polymer-direction-wedge.ts

@@ -5,17 +5,17 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { UnitsVisual } from '..';
+import { UnitsVisual } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { MeshBuilder } from '../../../geometry/mesh/mesh-builder';
 import { PolymerTraceIterator, createCurveSegmentState, interpolateCurveSegment, PolymerLocationIterator, getPolymerElementLoci, markPolymerElement } from './util/polymer';
 import { Vec3, Mat4 } from 'mol-math/linear-algebra';
 import { SecondaryStructureType, isNucleic } from 'mol-model/structure/model/types';
 import { UnitsMeshVisual, UnitsMeshParams } from '../units-visual';
 import { SizeTheme, SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
-import { Wedge } from '../../../primitive/wedge';
 import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
+import { Wedge } from 'mol-geo/primitive/wedge';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder';
 
 const t = Mat4.identity()
 const sVec = Vec3.zero()

src/mol-geo/representation/structure/visual/polymer-gap-cylinder.ts → src/mol-repr/structure/visual/polymer-gap-cylinder.ts

@@ -5,19 +5,19 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { MeshBuilder } from '../../../geometry/mesh/mesh-builder';
 import { PolymerGapIterator, PolymerGapLocationIterator, markPolymerGapElement, getPolymerGapElementLoci } from './util/polymer';
 import { Vec3 } from 'mol-math/linear-algebra';
 import { UnitsMeshVisual, UnitsMeshParams } from '../units-visual';
 import { SizeTheme, SizeThemeOptions, SizeThemeName } from 'mol-theme/size';
-import { CylinderProps } from '../../../primitive/cylinder';
-import { addSphere } from '../../../geometry/mesh/builder/sphere';
-import { addFixedCountDashedCylinder } from '../../../geometry/mesh/builder/cylinder';
 import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
 import { LinkCylinderParams } from './util/link';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder';
+import { CylinderProps } from 'mol-geo/primitive/cylinder';
+import { addSphere } from 'mol-geo/geometry/mesh/builder/sphere';
+import { addFixedCountDashedCylinder } from 'mol-geo/geometry/mesh/builder/cylinder';
 
 const segmentCount = 10
 

src/mol-geo/representation/structure/visual/polymer-trace-mesh.ts → src/mol-repr/structure/visual/polymer-trace-mesh.ts

@@ -5,17 +5,17 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { UnitsVisual, VisualUpdateState } from '..';
+import { UnitsVisual, VisualUpdateState } from '../index';
 import { RuntimeContext } from 'mol-task'
-import { Mesh } from '../../../geometry/mesh/mesh';
-import { MeshBuilder } from '../../../geometry/mesh/mesh-builder';
 import { PolymerTraceIterator, createCurveSegmentState, interpolateCurveSegment, PolymerLocationIterator, getPolymerElementLoci, markPolymerElement } from './util/polymer';
 import { SecondaryStructureType, isNucleic } from 'mol-model/structure/model/types';
 import { UnitsMeshVisual, UnitsMeshParams } from '../units-visual';
 import { SizeTheme, SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
-import { addSheet } from '../../../geometry/mesh/builder/sheet';
-import { addTube } from '../../../geometry/mesh/builder/tube';
 import { SelectParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder';
+import { addSheet } from 'mol-geo/geometry/mesh/builder/sheet';
+import { addTube } from 'mol-geo/geometry/mesh/builder/tube';
 
 export const PolymerTraceMeshParams = {
     sizeTheme: SelectParam<SizeThemeName>('Size Theme', '', 'physical', SizeThemeOptions),

src/mol-geo/representation/structure/visual/util/common.ts → src/mol-repr/structure/visual/util/common.ts

@@ -5,19 +5,19 @@
  */
 
 import { Unit, Structure } from 'mol-model/structure';
-import { LocationIterator } from '../../../../util/location-iterator';
-import { Mesh } from '../../../../geometry/mesh/mesh';
-import { StructureProps } from '../..';
+import { StructureProps } from '../../index';
 import { createMeshRenderObject, createPointsRenderObject, createLinesRenderObject, createDirectVolumeRenderObject } from 'mol-gl/render-object';
 import { RuntimeContext } from 'mol-task';
-import { TransformData, createIdentityTransform, createTransform } from '../../../../geometry/transform-data';
-import { Points } from '../../../../geometry/points/points';
-import { createRenderableState } from '../../../../geometry/geometry';
 import { Mat4 } from 'mol-math/linear-algebra';
-import { Lines } from '../../../../geometry/lines/lines';
-import { DirectVolume } from '../../../../geometry/direct-volume/direct-volume';
 import { SizeProps } from 'mol-geo/geometry/size-data';
 import { ColorProps } from 'mol-geo/geometry/color-data';
+import { TransformData, createTransform, createIdentityTransform } from 'mol-geo/geometry/transform-data';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { createRenderableState } from 'mol-geo/geometry/geometry';
+import { Points } from 'mol-geo/geometry/points/points';
+import { Lines } from 'mol-geo/geometry/lines/lines';
+import { DirectVolume } from 'mol-geo/geometry/direct-volume/direct-volume';
 
 export function createUnitsTransform({ units }: Unit.SymmetryGroup, transformData?: TransformData) {
     const unitCount = units.length

src/mol-geo/representation/structure/visual/util/element.ts → src/mol-repr/structure/visual/util/element.ts

@@ -7,15 +7,15 @@
 import { Vec3 } from 'mol-math/linear-algebra';
 import { Unit, StructureElement, Structure } from 'mol-model/structure';
 import { RuntimeContext } from 'mol-task';
-import { sphereVertexCount } from '../../../../primitive/sphere';
-import { Mesh } from '../../../../geometry/mesh/mesh';
-import { MeshBuilder } from '../../../../geometry/mesh/mesh-builder';
 import { Loci, EmptyLoci } from 'mol-model/loci';
 import { Interval, OrderedSet } from 'mol-data/int';
-import { PickingId } from '../../../../geometry/picking';
 import { SizeTheme, SizeThemeName } from 'mol-theme/size';
-import { LocationIterator } from '../../../../util/location-iterator';
-import { addSphere } from '../../../../geometry/mesh/builder/sphere';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { sphereVertexCount } from 'mol-geo/primitive/sphere';
+import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder';
+import { addSphere } from 'mol-geo/geometry/mesh/builder/sphere';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
 
 export interface ElementSphereMeshProps {
     sizeTheme: SizeThemeName,

src/mol-geo/representation/structure/visual/util/link.ts → src/mol-repr/structure/visual/util/link.ts

@@ -6,15 +6,15 @@
 
 import { Vec3 } from 'mol-math/linear-algebra';
 import { RuntimeContext } from 'mol-task';
-import { Mesh } from '../../../../geometry/mesh/mesh';
-import { MeshBuilder } from '../../../../geometry/mesh/mesh-builder';
 import { LinkType } from 'mol-model/structure/model/types';
 import { SizeThemeName, SizeThemeOptions } from 'mol-theme/size';
-import { CylinderProps } from '../../../../primitive/cylinder';
-import { LocationIterator } from '../../../../util/location-iterator';
 import { Unit, StructureElement, Structure, Link } from 'mol-model/structure';
-import { addFixedCountDashedCylinder, addCylinder, addDoubleCylinder } from '../../../../geometry/mesh/builder/cylinder';
 import { SelectParam, RangeParam, NumberParam, paramDefaultValues } from 'mol-util/parameter';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { MeshBuilder } from 'mol-geo/geometry/mesh/mesh-builder';
+import { CylinderProps } from 'mol-geo/primitive/cylinder';
+import { addFixedCountDashedCylinder, addCylinder, addDoubleCylinder } from 'mol-geo/geometry/mesh/builder/cylinder';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
 
 export const LinkCylinderParams = {
     sizeTheme: SelectParam<SizeThemeName>('Size Theme', '', 'uniform', SizeThemeOptions),

src/mol-geo/representation/structure/visual/util/nucleotide.ts → src/mol-repr/structure/visual/util/nucleotide.ts

@@ -5,11 +5,11 @@
  */
 
 import { Unit, StructureElement } from 'mol-model/structure';
-import { LocationIterator } from '../../../../util/location-iterator';
 import { getNucleotideElements } from 'mol-model/structure/structure/util/nucleotide';
-import { PickingId } from '../../../../geometry/picking';
 import { Loci, EmptyLoci } from 'mol-model/loci';
 import { OrderedSet, Interval } from 'mol-data/int';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { PickingId } from 'mol-geo/geometry/picking';
 
 export namespace NucleotideLocationIterator {
     export function fromGroup(group: Unit.SymmetryGroup): LocationIterator {

src/mol-geo/representation/structure/visual/util/polymer.ts → src/mol-repr/structure/visual/util/polymer.ts

@@ -6,10 +6,10 @@
 
 import { Unit, ElementIndex, StructureElement, Link } from 'mol-model/structure';
 import SortedRanges from 'mol-data/int/sorted-ranges';
-import { LocationIterator } from '../../../../util/location-iterator';
-import { PickingId } from '../../../../geometry/picking';
 import { OrderedSet, Interval } from 'mol-data/int';
 import { EmptyLoci, Loci } from 'mol-model/loci';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { PickingId } from 'mol-geo/geometry/picking';
 
 export * from './polymer/backbone-iterator'
 export * from './polymer/gap-iterator'

src/mol-geo/representation/util.ts → src/mol-repr/util.ts

@@ -6,7 +6,7 @@
 
 import { defaults } from 'mol-util';
 import { Structure } from 'mol-model/structure';
-import { VisualQuality } from '../geometry/geometry';
+import { VisualQuality } from '../mol-geo/geometry/geometry';
 
 export interface QualityProps {
     quality: VisualQuality

src/mol-geo/representation/volume/direct-volume.ts → src/mol-repr/volume/direct-volume.ts

@@ -6,14 +6,10 @@
 
 import { VolumeData } from 'mol-model/volume'
 import { RuntimeContext } from 'mol-task'
-import { VolumeVisual, VolumeRepresentation } from '.';
+import { VolumeVisual, VolumeRepresentation } from './index';
 import { DirectVolumeRenderObject, createDirectVolumeRenderObject } from 'mol-gl/render-object';
-import { PickingId } from '../../geometry/picking';
-import { MarkerAction } from '../../geometry/marker-data';
 import { Loci, EmptyLoci } from 'mol-model/loci';
-import { createRenderableState, updateRenderableState, Geometry } from '../../geometry/geometry';
 import { paramDefaultValues } from 'mol-util/parameter';
-import { DirectVolume } from '../../geometry/direct-volume/direct-volume';
 import { Vec3, Mat4 } from 'mol-math/linear-algebra';
 import { Box3D } from 'mol-math/geometry';
 import { WebGLContext } from 'mol-gl/webgl/context';
@@ -21,6 +17,10 @@ import { createTexture } from 'mol-gl/webgl/texture';
 import { LocationIterator } from 'mol-geo/util/location-iterator';
 import { NullLocation } from 'mol-model/location';
 import { createIdentityTransform } from 'mol-geo/geometry/transform-data';
+import { DirectVolume } from 'mol-geo/geometry/direct-volume/direct-volume';
+import { Geometry, createRenderableState, updateRenderableState } from 'mol-geo/geometry/geometry';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
 
 function getBoundingBox(gridDimension: Vec3, transform: Mat4) {
     const bbox = Box3D.empty()

src/mol-geo/representation/volume/index.ts → src/mol-repr/volume/index.ts

@@ -7,11 +7,11 @@
 import { Task } from 'mol-task'
 import { RepresentationProps, Representation, Visual } from '..';
 import { VolumeData } from 'mol-model/volume';
-import { PickingId } from '../../geometry/picking';
 import { Loci, EmptyLoci } from 'mol-model/loci';
-import { MarkerAction } from '../../geometry/marker-data';
-import { Geometry } from '../../geometry/geometry';
 import { paramDefaultValues } from 'mol-util/parameter';
+import { Geometry } from 'mol-geo/geometry/geometry';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
 
 export interface VolumeVisual<P extends RepresentationProps = {}> extends Visual<VolumeData, P> { }
 

src/mol-geo/representation/volume/isosurface-mesh.ts → src/mol-repr/volume/isosurface-mesh.ts

@@ -7,19 +7,19 @@
 
 import { VolumeData, VolumeIsoValue } from 'mol-model/volume'
 import { RuntimeContext } from 'mol-task'
-import { computeMarchingCubesMesh } from '../../util/marching-cubes/algorithm';
-import { Mesh } from '../../geometry/mesh/mesh';
-import { VolumeVisual, VolumeRepresentation } from '.';
+import { VolumeVisual, VolumeRepresentation } from './index';
 import { createMeshRenderObject, MeshRenderObject } from 'mol-gl/render-object';
-import { PickingId } from '../../geometry/picking';
-import { MarkerAction } from '../../geometry/marker-data';
 import { Loci, EmptyLoci } from 'mol-model/loci';
-import { LocationIterator } from '../../util/location-iterator';
 import { NullLocation } from 'mol-model/location';
-import { createIdentityTransform } from '../../geometry/transform-data';
-import { createRenderableState, updateRenderableState } from '../../geometry/geometry';
 import { paramDefaultValues, RangeParam } from 'mol-util/parameter';
 import { ValueCell } from 'mol-util';
+import { Mesh } from 'mol-geo/geometry/mesh/mesh';
+import { computeMarchingCubesMesh } from 'mol-geo/util/marching-cubes/algorithm';
+import { LocationIterator } from 'mol-geo/util/location-iterator';
+import { createIdentityTransform } from 'mol-geo/geometry/transform-data';
+import { createRenderableState, updateRenderableState } from 'mol-geo/geometry/geometry';
+import { PickingId } from 'mol-geo/geometry/picking';
+import { MarkerAction } from 'mol-geo/geometry/marker-data';
 
 export async function createVolumeSurface(ctx: RuntimeContext, volume: VolumeData, isoValueAbsolute: number, mesh?: Mesh) {
     ctx.update({ message: 'Marching cubes...' });

tsconfig.json

@@ -17,17 +17,18 @@
             "mol-app": ["./mol-app"],
             "mol-data": ["./mol-data", "./mol-data/index.ts"],
             "mol-geo": ["./mol-geo"],
-            "mol-theme": ["./mol-theme"],
             "mol-gl": ["./mol-gl"],
             "mol-io": ["./mol-io"],
             "mol-math": ["./mol-math"],
             "mol-model": ["./mol-model"],
             "mol-model-props": ["./mol-model-props", "./mol-model-props/index.ts"],
             "mol-ql": ["./mol-ql"],
+            "mol-repr": ["./mol-repr"],
             "mol-script": ["./mol-script"],
             "mol-state": ["./mol-state", "./mol-state/index.ts"],
             "mol-plugin": ["./mol-plugin", "./mol-plugin/index.ts"],
             "mol-task": ["./mol-task", "./mol-task/index.ts"],
+            "mol-theme": ["./mol-theme"],
             "mol-util": ["./mol-util", "./mol-util/index.ts"],
             "mol-canvas3d": ["./mol-view"]
         }