diff --git a/src/common/_spec/collections.spec.ts b/src/mol-base/_spec/collections.spec.ts
similarity index 100%
rename from src/common/_spec/collections.spec.ts
rename to src/mol-base/_spec/collections.spec.ts
diff --git a/src/common/collections/chunked-array.ts b/src/mol-base/collections/chunked-array.ts
similarity index 100%
rename from src/common/collections/chunked-array.ts
rename to src/mol-base/collections/chunked-array.ts
diff --git a/src/common/collections/hash-functions.ts b/src/mol-base/collections/hash-functions.ts
similarity index 100%
rename from src/common/collections/hash-functions.ts
rename to src/mol-base/collections/hash-functions.ts
diff --git a/src/common/collections/hash-set.ts b/src/mol-base/collections/hash-set.ts
similarity index 100%
rename from src/common/collections/hash-set.ts
rename to src/mol-base/collections/hash-set.ts
diff --git a/src/common/collections/int-tuple.ts b/src/mol-base/collections/int-tuple.ts
similarity index 100%
rename from src/common/collections/int-tuple.ts
rename to src/mol-base/collections/int-tuple.ts
diff --git a/src/common/collections/iterator.ts b/src/mol-base/collections/iterator.ts
similarity index 100%
rename from src/common/collections/iterator.ts
rename to src/mol-base/collections/iterator.ts
diff --git a/src/common/collections/linked-index.ts b/src/mol-base/collections/linked-index.ts
similarity index 100%
rename from src/common/collections/linked-index.ts
rename to src/mol-base/collections/linked-index.ts
diff --git a/src/common/collections/ordered-set.ts b/src/mol-base/collections/ordered-set.ts
similarity index 100%
rename from src/common/collections/ordered-set.ts
rename to src/mol-base/collections/ordered-set.ts
diff --git a/src/common/collections/sort.ts b/src/mol-base/collections/sort.ts
similarity index 100%
rename from src/common/collections/sort.ts
rename to src/mol-base/collections/sort.ts
diff --git a/src/common/computation.ts b/src/mol-base/computation.ts
similarity index 100%
rename from src/common/computation.ts
rename to src/mol-base/computation.ts
diff --git a/src/common/math/linear-algebra.ts b/src/mol-base/math/linear-algebra.ts
similarity index 100%
rename from src/common/math/linear-algebra.ts
rename to src/mol-base/math/linear-algebra.ts
diff --git a/src/common/scheduler.ts b/src/mol-base/scheduler.ts
similarity index 100%
rename from src/common/scheduler.ts
rename to src/mol-base/scheduler.ts
diff --git a/src/mol-data/_spec/atom-set.spec.ts b/src/mol-data/_spec/atom-set.spec.ts
index 5e8a607c1a18a8d07ba69b5669c4d24cc39123b0..0f053700a71d250180e7500d5ae04724cd9b3777 100644
--- a/src/mol-data/_spec/atom-set.spec.ts
+++ b/src/mol-data/_spec/atom-set.spec.ts
@@ -4,8 +4,8 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import IntTuple from '../../common/collections/int-tuple'
-import OrderedSet from '../../common/collections/ordered-set'
+import IntTuple from '../../mol-base/collections/int-tuple'
+import OrderedSet from '../../mol-base/collections/ordered-set'
 import AtomSet from '../atom-set'
 
 describe('atom set', () => {
diff --git a/src/mol-data/atom-set.ts b/src/mol-data/atom-set.ts
index 41c65c4e0161c41002e2ad294b109cc84601205e..9eb446f29b30facc70af75f63757af5509437944 100644
--- a/src/mol-data/atom-set.ts
+++ b/src/mol-data/atom-set.ts
@@ -4,11 +4,11 @@
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import OrderedSet from '../common/collections/ordered-set'
-import Iterator from '../common/collections/iterator'
-import IntTuple from '../common/collections/int-tuple'
-import { sortArray } from '../common/collections/sort'
-import { hash1 } from '../common/collections/hash-functions'
+import OrderedSet from '../mol-base/collections/ordered-set'
+import Iterator from '../mol-base/collections/iterator'
+import IntTuple from '../mol-base/collections/int-tuple'
+import { sortArray } from '../mol-base/collections/sort'
+import { hash1 } from '../mol-base/collections/hash-functions'
 
 /** A map-like representation of integer set */
 interface AtomSet { '@type': 'atom-set' }
diff --git a/src/mol-data/structure/model.ts b/src/mol-data/structure/model.ts
index 167801cc95af8d4a8289c3cbb4053ce368b9b1a7..5cbb92fe75344e37fab91cb3e369a26f34637904 100644
--- a/src/mol-data/structure/model.ts
+++ b/src/mol-data/structure/model.ts
@@ -6,7 +6,7 @@
 
 import * as Data from './data'
 import { Selectors } from './selectors'
-import { Vec3, Mat4 } from '../../common/math/linear-algebra'
+import { Vec3, Mat4 } from '../../mol-base/math/linear-algebra'
 
 let _uid = 0;
 /** Model-related unique identifiers */
diff --git a/src/mol-io/reader/cif/binary/parser.ts b/src/mol-io/reader/cif/binary/parser.ts
index 851e6974a23d9539bff5f9194c6a5555eb4b009c..45f826f591a91447ca24ec96bcbc9447c73150e8 100644
--- a/src/mol-io/reader/cif/binary/parser.ts
+++ b/src/mol-io/reader/cif/binary/parser.ts
@@ -9,7 +9,7 @@ import * as Encoding from './encoding'
 import Field from './field'
 import Result from '../../result'
 import decodeMsgPack from '../../../utils/msgpack/decode'
-import Computation from '../../../../common/computation'
+import Computation from '../../../../mol-base/computation'
 
 function checkVersions(min: number[], current: number[]) {
     for (let i = 0; i < 2; i++) {
diff --git a/src/mol-io/reader/cif/text/parser.ts b/src/mol-io/reader/cif/text/parser.ts
index 1607f462251f130a1805cde457b3da478358cc7e..a328b8e6c9ac5be1d328b1ad026da13911257a78 100644
--- a/src/mol-io/reader/cif/text/parser.ts
+++ b/src/mol-io/reader/cif/text/parser.ts
@@ -26,7 +26,7 @@ import * as Data from '../data-model'
 import Field from './field'
 import { Tokens, TokenBuilder } from '../../common/text/tokenizer'
 import Result from '../../result'
-import Computation from '../../../../common/computation'
+import Computation from '../../../../mol-base/computation'
 
 /**
  * Types of supported mmCIF tokens.
diff --git a/src/mol-io/reader/common/text/tokenizer.ts b/src/mol-io/reader/common/text/tokenizer.ts
index 85b72166beae902d6dc93f9655db5758550c17a6..cbddb018b550fc1b3242757bfbc2ffd15608e5c7 100644
--- a/src/mol-io/reader/common/text/tokenizer.ts
+++ b/src/mol-io/reader/common/text/tokenizer.ts
@@ -6,7 +6,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 
-import Computation from '../../../../common/computation'
+import Computation from '../../../../mol-base/computation'
 
 export interface Tokenizer {
     data: string,
diff --git a/src/mol-io/reader/gro/parser.ts b/src/mol-io/reader/gro/parser.ts
index 1cc837935e04cc8ef582da4d878eea98686ff7e9..3c71b3adbd1a3553849b26aa29b6a2f706672ac5 100644
--- a/src/mol-io/reader/gro/parser.ts
+++ b/src/mol-io/reader/gro/parser.ts
@@ -10,7 +10,7 @@ import FixedColumn from '../common/text/column/fixed'
 import { ColumnType, UndefinedColumn } from '../common/column'
 import * as Schema from './schema'
 import Result from '../result'
-import Computation from '../../../common/computation'
+import Computation from '../../../mol-base/computation'
 
 interface State {
     tokenizer: Tokenizer,
diff --git a/src/perf-tests/chunked-array-vs-native.ts b/src/perf-tests/chunked-array-vs-native.ts
index 8281e459c253ae5a8626be444130b3bd56792974..7ac14c454e603198bf14ccc2ec12e7d3ba1af26e 100644
--- a/src/perf-tests/chunked-array-vs-native.ts
+++ b/src/perf-tests/chunked-array-vs-native.ts
@@ -1,5 +1,5 @@
 import * as B from 'benchmark'
-import ChunkedArray from '../common/collections/chunked-array'
+import ChunkedArray from '../mol-base/collections/chunked-array'
 
 function testNative(size: number) {
     const xs = new Array(size);
diff --git a/src/perf-tests/sets.ts b/src/perf-tests/sets.ts
index eabae6dc0446aa25a0d75aaa7862561bbed567ad..fbca5616e377b0fe2225c3dc66866a795e2d7c74 100644
--- a/src/perf-tests/sets.ts
+++ b/src/perf-tests/sets.ts
@@ -1,6 +1,6 @@
 import * as B from 'benchmark'
-import IntTuple from '../common/collections/int-tuple'
-import OrdSet from '../common/collections/ordered-set'
+import IntTuple from '../mol-base/collections/int-tuple'
+import OrdSet from '../mol-base/collections/ordered-set'
 import AtomSet from '../mol-data/atom-set'
 
 namespace Iteration {
diff --git a/src/perf-tests/sort.ts b/src/perf-tests/sort.ts
index f5d2a3f689f1df115fa365a0fe53dcf1c92301d9..3b4bab9f386cdf5797c28c655632e15ceade9906 100644
--- a/src/perf-tests/sort.ts
+++ b/src/perf-tests/sort.ts
@@ -1,5 +1,5 @@
 import * as B from 'benchmark'
-import * as Sort from '../common/collections/sort'
+import * as Sort from '../mol-base/collections/sort'
 
 function shuffle(a: number[]) {
     for (let i = a.length - 1; i > 0; i--) {
diff --git a/src/script.ts b/src/script.ts
index b7465462860e92c9fcf18102ad7c1e52498ec696..0870d4429cc7503af3a852f0b6cbc361997042f4 100644
--- a/src/script.ts
+++ b/src/script.ts
@@ -15,7 +15,7 @@ const writeFileAsync = util.promisify(fs.writeFile);
 import Gro from './mol-io/reader/gro/parser'
 import CIF from './mol-io/reader/cif/index'
 
-import Computation from './common/computation'
+import Computation from './mol-base/computation'
 
 // import { toTypedFrame as applySchema } from './reader/cif/schema'
 import { generateSchema } from './mol-io/reader/cif/schema/utils'