diff --git a/LICENSE b/LICENSE
index b05c3f1cd13322e18f87e642077d8b67c7e99e9c..c4c761c0706abd3eaa70951fcebed56e40f9a6bd 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,6 +1,6 @@
 The MIT License
 
-    Copyright (c) 2017, MolIO contributors
+    Copyright (c) 2017, Mol* contributors
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/package.json b/package.json
index 44965fe0363c9778d55f9bd608f0234570bd2dba..d6ddc61c460c78fca42b1210eedad59b287efd88 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-  "name": "molio",
+  "name": "mol-star",
   "version": "0.1.0",
-  "description": "Parsers for molecular data.",
+  "description": "Comprehensive molecular library.",
   "main": "dist/molio.js",
   "module": "dist/molio.esm.js",
   "types": "src/index.d.ts",
diff --git a/src/mol-base/collections/_spec/equiv-index.spec.ts b/src/mol-base/collections/_spec/equiv-index.spec.ts
index 967bea3b08fa2300c0013409e8cea295e62b79df..d2d0a2856f7b8eae587ce119d9c9c06740fa862a 100644
--- a/src/mol-base/collections/_spec/equiv-index.spec.ts
+++ b/src/mol-base/collections/_spec/equiv-index.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/_spec/iterators.spec.ts b/src/mol-base/collections/_spec/iterators.spec.ts
index 7c8cabe4a0ad77f1d5181213ca2d32c624a93f61..a2e9a353650010c377c64699c9e47ab19fcc7556 100644
--- a/src/mol-base/collections/_spec/iterators.spec.ts
+++ b/src/mol-base/collections/_spec/iterators.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/_spec/sort.spec.ts b/src/mol-base/collections/_spec/sort.spec.ts
index 4b6773b769da6c003ecad1c821b602b6d31283a1..4bccb03cbc4d165ad297081f86c767b67dcbd971 100644
--- a/src/mol-base/collections/_spec/sort.spec.ts
+++ b/src/mol-base/collections/_spec/sort.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/chunked-array.ts b/src/mol-base/collections/chunked-array.ts
index 3ce84f5cdf1b72760f81519cb41a118be7d54f70..0664a4c12ce99348f609b0d8558e28836f0b8dc2 100644
--- a/src/mol-base/collections/chunked-array.ts
+++ b/src/mol-base/collections/chunked-array.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * from https://github.com/dsehnal/CIFTools.js
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-base/collections/database.ts b/src/mol-base/collections/database.ts
index 520d690cd79e29d6465bdda28bc78d79e9559935..78818f8d85ad27872eefb9cf76fec6bcd048e5bf 100644
--- a/src/mol-base/collections/database.ts
+++ b/src/mol-base/collections/database.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/database/_spec/table.spec.ts b/src/mol-base/collections/database/_spec/table.spec.ts
index c39c73e4fd591258ef1157d1cedc6ff58e2af732..69e5342316717598bee67df691ae40be8bb3594b 100644
--- a/src/mol-base/collections/database/_spec/table.spec.ts
+++ b/src/mol-base/collections/database/_spec/table.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/database/column-helpers.ts b/src/mol-base/collections/database/column-helpers.ts
index b57deec09a41d9c88c346066058c962a88de9d6d..b1645fb061f9346e4ebfd8f3bb45c1e27397e435 100644
--- a/src/mol-base/collections/database/column-helpers.ts
+++ b/src/mol-base/collections/database/column-helpers.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/database/column.ts b/src/mol-base/collections/database/column.ts
index f36ec2f9766ea2496eaed83aed939730febf28cb..80b9fc94cf0b6232c9efc1d713489008128e2600 100644
--- a/src/mol-base/collections/database/column.ts
+++ b/src/mol-base/collections/database/column.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/database/database.ts b/src/mol-base/collections/database/database.ts
index 0e4d378b446a8361d610828800b239528d173313..e25041fc0364e9160cf27f26ead92bdfcd90b2d5 100644
--- a/src/mol-base/collections/database/database.ts
+++ b/src/mol-base/collections/database/database.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/database/table.ts b/src/mol-base/collections/database/table.ts
index 9d376f13491ce6d5a3a3bfa9e7f8cdff0460c9ca..fa701fa39b8828c179346ee9bf2982082a2ae8e8 100644
--- a/src/mol-base/collections/database/table.ts
+++ b/src/mol-base/collections/database/table.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/equivalence-classes.ts b/src/mol-base/collections/equivalence-classes.ts
index 5f32c4dc33ec2ba6b870707dd8fb51dd7423585d..936d39b299ed33956605642cd7b2c8a7041ef368 100644
--- a/src/mol-base/collections/equivalence-classes.ts
+++ b/src/mol-base/collections/equivalence-classes.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/hash-functions.ts b/src/mol-base/collections/hash-functions.ts
index 1394e40a453e42e9ca54f431169985a79f15a8db..00cae92c4d6f16ba47ed7281b5a773d432198164 100644
--- a/src/mol-base/collections/hash-functions.ts
+++ b/src/mol-base/collections/hash-functions.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/hash-set.ts b/src/mol-base/collections/hash-set.ts
index b3ef13b9e891a37c6a98d7f4efee4bf249c5b452..297b8eeb6b9c09c121739a7c9a468d3443a343dc 100644
--- a/src/mol-base/collections/hash-set.ts
+++ b/src/mol-base/collections/hash-set.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer.ts b/src/mol-base/collections/integer.ts
index aba4ca874c4776c08020b95c299f968f679252bf..1abd46acc7f2b4af648dca0d77c0f05b0cb2f201 100644
--- a/src/mol-base/collections/integer.ts
+++ b/src/mol-base/collections/integer.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/_spec/interval.spec.ts b/src/mol-base/collections/integer/_spec/interval.spec.ts
index 9aa97bdbd534c1a6c44111b39f2c7b3875be1a88..0373891338e14a3df9a2390023780dee51d80063 100644
--- a/src/mol-base/collections/integer/_spec/interval.spec.ts
+++ b/src/mol-base/collections/integer/_spec/interval.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/_spec/linked-index.spec.ts b/src/mol-base/collections/integer/_spec/linked-index.spec.ts
index 9f811f2e91b3095f3edc89d11441f022b489ef3f..743c39a3e0b3170e988c1fcb012981db5141a9f2 100644
--- a/src/mol-base/collections/integer/_spec/linked-index.spec.ts
+++ b/src/mol-base/collections/integer/_spec/linked-index.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/_spec/ordered-set.spec.ts b/src/mol-base/collections/integer/_spec/ordered-set.spec.ts
index 41b70f708458908e4ae701bc333650ec709d7881..37d5ae0d42676d864434d5af6b7e0f91003e93fc 100644
--- a/src/mol-base/collections/integer/_spec/ordered-set.spec.ts
+++ b/src/mol-base/collections/integer/_spec/ordered-set.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/_spec/segmentation.spec.ts b/src/mol-base/collections/integer/_spec/segmentation.spec.ts
index 6047b09c120c39712dbfa12e717b35795e6f4a41..f91eff82ac3ad56bdaa039d07a933faf015400bc 100644
--- a/src/mol-base/collections/integer/_spec/segmentation.spec.ts
+++ b/src/mol-base/collections/integer/_spec/segmentation.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/_spec/sorted-array.spec.ts b/src/mol-base/collections/integer/_spec/sorted-array.spec.ts
index 679fca68ecc0675dbe810977d291789494c8e2c0..db8cd15d7c90b396bc1226635c34b3222982dcbb 100644
--- a/src/mol-base/collections/integer/_spec/sorted-array.spec.ts
+++ b/src/mol-base/collections/integer/_spec/sorted-array.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/_spec/tuple.spec.ts b/src/mol-base/collections/integer/_spec/tuple.spec.ts
index 45b02a0ef0d6772f7eb634c463a9973f93c4afca..37610b8393b40f1305d460dfab128d99d8954887 100644
--- a/src/mol-base/collections/integer/_spec/tuple.spec.ts
+++ b/src/mol-base/collections/integer/_spec/tuple.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/impl/interval.ts b/src/mol-base/collections/integer/impl/interval.ts
index 3a265b8b266bdf81bd1cf841377c4140039770fb..79b9b12730e6e89a4e6f4392533b4d56d08888b7 100644
--- a/src/mol-base/collections/integer/impl/interval.ts
+++ b/src/mol-base/collections/integer/impl/interval.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/impl/ordered-set.ts b/src/mol-base/collections/integer/impl/ordered-set.ts
index 255c7772fa9817f8a6ef8b34cbc898e6fe39b1fe..a5631f761af3bf18692ad13758ec304068da56c0 100644
--- a/src/mol-base/collections/integer/impl/ordered-set.ts
+++ b/src/mol-base/collections/integer/impl/ordered-set.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/impl/segmentation.ts b/src/mol-base/collections/integer/impl/segmentation.ts
index 357252a63c2d0f56f2711e188333bf9039dccbe6..7caa3bfb8919e5476fddf430ccc793f8df786fc3 100644
--- a/src/mol-base/collections/integer/impl/segmentation.ts
+++ b/src/mol-base/collections/integer/impl/segmentation.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/impl/sorted-array.ts b/src/mol-base/collections/integer/impl/sorted-array.ts
index 8056ad029006d814ec6d36c08bb395735833f699..fe0d90565959d7b3406596af78de7c46f72cbc55 100644
--- a/src/mol-base/collections/integer/impl/sorted-array.ts
+++ b/src/mol-base/collections/integer/impl/sorted-array.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/interval.ts b/src/mol-base/collections/integer/interval.ts
index 522d5eb7332f390df8937da8fde72a8e31614d42..dc5b0de839c2eb0bbd5fe8d7f0b94a6eb27bf6e2 100644
--- a/src/mol-base/collections/integer/interval.ts
+++ b/src/mol-base/collections/integer/interval.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/linked-index.ts b/src/mol-base/collections/integer/linked-index.ts
index 0433ba03de4d1d5b51acab4b9368ac777c1b68ad..94f119c9bd061d60261b9095a983cceb38c73dec 100644
--- a/src/mol-base/collections/integer/linked-index.ts
+++ b/src/mol-base/collections/integer/linked-index.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/ordered-set.ts b/src/mol-base/collections/integer/ordered-set.ts
index b0291432db0b1d9db5afed281ea253c2d600d633..2520643108bf28deb22e2bdc26852b17a37f91d4 100644
--- a/src/mol-base/collections/integer/ordered-set.ts
+++ b/src/mol-base/collections/integer/ordered-set.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/segmentation.ts b/src/mol-base/collections/integer/segmentation.ts
index 3416c530bf91392db9ebf9444d44627f2d9d4970..51f5c5ecd54336d228da2de473d5fbc877c8d35c 100644
--- a/src/mol-base/collections/integer/segmentation.ts
+++ b/src/mol-base/collections/integer/segmentation.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/sorted-array.ts b/src/mol-base/collections/integer/sorted-array.ts
index 701ea8ea37487ded87e3718214c9715f3448ea7b..08235061224bfebfdf5f019281936e5c090bb65b 100644
--- a/src/mol-base/collections/integer/sorted-array.ts
+++ b/src/mol-base/collections/integer/sorted-array.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/integer/tuple.ts b/src/mol-base/collections/integer/tuple.ts
index 19ad017c579dc45551226da26e49ae9545629159..86cf4ea6bc3a1daa077f1026f04243fdd7e915dc 100644
--- a/src/mol-base/collections/integer/tuple.ts
+++ b/src/mol-base/collections/integer/tuple.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/iterator.ts b/src/mol-base/collections/iterator.ts
index 02f302d82301b4d3edbedbce7d24a18da3dd572a..7a139a850e36c9c997127f0a020376ddf5b5f33e 100644
--- a/src/mol-base/collections/iterator.ts
+++ b/src/mol-base/collections/iterator.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/collections/sort.ts b/src/mol-base/collections/sort.ts
index 86525401ae76e8783e6808a793621c735015e807..e6eb6571ea82387a9e121e364ecb6528847d7da9 100644
--- a/src/mol-base/collections/sort.ts
+++ b/src/mol-base/collections/sort.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/computation.ts b/src/mol-base/computation.ts
index 2a4d6075156c0155c21e186273bb2fa25c31ec00..d81b970a9f367527f6a03b28f0d2e30d9807b5b9 100644
--- a/src/mol-base/computation.ts
+++ b/src/mol-base/computation.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * Adapted from https://github.com/dsehnal/LiteMol
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-base/geometry/grid-lookup.ts b/src/mol-base/geometry/grid-lookup.ts
new file mode 100644
index 0000000000000000000000000000000000000000..f7723b745c8d2abec8f865fcd6f3f5db2d370353
--- /dev/null
+++ b/src/mol-base/geometry/grid-lookup.ts
@@ -0,0 +1,2 @@
+// TODO: 3d grid lookup (use single cell for small sets), make bounding sphere part of the structure
+// TODO: assign radius to points?
\ No newline at end of file
diff --git a/src/mol-base/geometry/sphere.ts b/src/mol-base/geometry/sphere.ts
new file mode 100644
index 0000000000000000000000000000000000000000..6135cbf4b6a96564aed1ffd3de8ef78dddd608b2
--- /dev/null
+++ b/src/mol-base/geometry/sphere.ts
@@ -0,0 +1 @@
+// TODO: rebranded vec4
\ No newline at end of file
diff --git a/src/mol-base/geometry/transform.ts b/src/mol-base/geometry/transform.ts
new file mode 100644
index 0000000000000000000000000000000000000000..4eb1d64c650036f82a6dd6319d2ee32a9eb3db9c
--- /dev/null
+++ b/src/mol-base/geometry/transform.ts
@@ -0,0 +1,27 @@
+/**
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ *
+ * @author David Sehnal <david.sehnal@gmail.com>
+ */
+
+import { Mat4 } from '../math/linear-algebra-3d'
+
+interface Transform extends Readonly<{
+    transform: Mat4,
+    // cache the inverse of the transform
+    inverse: Mat4,
+    // optimize the identity case
+    isIdentity: boolean
+}> { }
+
+namespace Transform {
+    export function isIdentity(m: Mat4) {
+        throw 'nyi'
+    }
+
+    export function isRotationAndTranslation(m: Mat4) {
+        throw 'nyi'
+    }
+}
+
+export default Transform
\ No newline at end of file
diff --git a/src/mol-base/math/linear-algebra.ts b/src/mol-base/math/linear-algebra-3d.ts
similarity index 99%
rename from src/mol-base/math/linear-algebra.ts
rename to src/mol-base/math/linear-algebra-3d.ts
index 909c199bac88d653ffc9f6d5056b26464e3097ab..cfbf4010ac6a1048760ef1b61f64043a32fb9acf 100644
--- a/src/mol-base/math/linear-algebra.ts
+++ b/src/mol-base/math/linear-algebra-3d.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/utils/bit-flags.ts b/src/mol-base/utils/bit-flags.ts
index acf1fc2f5cfd48464a6668bb2e4db37ef786c31f..0cf3b761d5c4297081fab1eb9cd7c340e80fe99b 100644
--- a/src/mol-base/utils/bit-flags.ts
+++ b/src/mol-base/utils/bit-flags.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/utils/scheduler.ts b/src/mol-base/utils/scheduler.ts
index d061959047740ce72126413192885c5546153f9a..85ad75eff32fcfe5e464aa876a76e449849f40af 100644
--- a/src/mol-base/utils/scheduler.ts
+++ b/src/mol-base/utils/scheduler.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/utils/time.ts b/src/mol-base/utils/time.ts
index 5a4290f13864f21c789e852fa08fa2fcebb5c341..a0ee3abfdeccd9b60ee442d460e49b2f496f7813 100644
--- a/src/mol-base/utils/time.ts
+++ b/src/mol-base/utils/time.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-base/utils/uuid.ts b/src/mol-base/utils/uuid.ts
index ed7728d448c5d98ad359a683a15078055ef2ce57..29c7d24de7e1b2d8a662d5f3c9402e274878ce41 100644
--- a/src/mol-base/utils/uuid.ts
+++ b/src/mol-base/utils/uuid.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure.ts b/src/mol-data/structure.ts
index 5542ea39939397d841b9449c0c4ce19352b722d9..38d5890d5f0fada2ea72a32c23e6e9d3f2e0261b 100644
--- a/src/mol-data/structure.ts
+++ b/src/mol-data/structure.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/_spec/atom-set.spec.ts b/src/mol-data/structure/_spec/atom-set.spec.ts
index ace1717966c12fdc25e498df44c590f8f434c274..03ca325564fc49352c421ae63adbf90472d7372f 100644
--- a/src/mol-data/structure/_spec/atom-set.spec.ts
+++ b/src/mol-data/structure/_spec/atom-set.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model.ts b/src/mol-data/structure/model.ts
index 1fd76534768b57ae6fa2386a6befaa78d1ea32e2..b26cbbfbf4ef513d2aa5e08ec5d4c88309c5b41e 100644
--- a/src/mol-data/structure/model.ts
+++ b/src/mol-data/structure/model.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/constants.ts b/src/mol-data/structure/model/constants.ts
index 03072eb6fe53b56197129884617af5d6b2ffbd38..58ada8080e91a2f173769c1108595bdd218ff5b3 100644
--- a/src/mol-data/structure/model/constants.ts
+++ b/src/mol-data/structure/model/constants.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-data/structure/model/format.ts b/src/mol-data/structure/model/format.ts
index e1878bbdb8ded54aff9da4db4882fa1cebc02363..3f376d1fe0ea4acc400dfc413629b6d54b8420b6 100644
--- a/src/mol-data/structure/model/format.ts
+++ b/src/mol-data/structure/model/format.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/formats/mmcif.ts b/src/mol-data/structure/model/formats/mmcif.ts
index 5f6cf3c9c6ebace88b2b45f2600cfa38889a6963..377a1c613f453a5e71e2481b6fd563f195e2512f 100644
--- a/src/mol-data/structure/model/formats/mmcif.ts
+++ b/src/mol-data/structure/model/formats/mmcif.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/model.ts b/src/mol-data/structure/model/model.ts
index 9cdfd3787284c68adbc86da838b55debbbec2bfd..c393d2452c0d7fdf18a75ab236a7ce50ee39950d 100644
--- a/src/mol-data/structure/model/model.ts
+++ b/src/mol-data/structure/model/model.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/properties/computed.ts b/src/mol-data/structure/model/properties/computed.ts
index 0cb9039cc326cec4a3efab1091de480622abb7dc..39896495fbaa30bcf65f3575e6664b7517a9af68 100644
--- a/src/mol-data/structure/model/properties/computed.ts
+++ b/src/mol-data/structure/model/properties/computed.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/properties/conformation.ts b/src/mol-data/structure/model/properties/conformation.ts
index 2d415686360705dbde092429b743cbea45f137b4..c53ab084438e65b141a1ba6d85256cf2ed981641 100644
--- a/src/mol-data/structure/model/properties/conformation.ts
+++ b/src/mol-data/structure/model/properties/conformation.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/properties/format-specific.ts b/src/mol-data/structure/model/properties/format-specific.ts
index 2a7bb4398ea08725cf98d5e741c909584d3a746d..a978e6aca0854c64d8432445da85b89855d267fe 100644
--- a/src/mol-data/structure/model/properties/format-specific.ts
+++ b/src/mol-data/structure/model/properties/format-specific.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/properties/hierarchy.ts b/src/mol-data/structure/model/properties/hierarchy.ts
index 365c3943a09743ee4ecb4c4f2a27bb4a0391290b..a8062be001d4008b84e109d016ba781e0f8861cc 100644
--- a/src/mol-data/structure/model/properties/hierarchy.ts
+++ b/src/mol-data/structure/model/properties/hierarchy.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/properties/transforms.ts b/src/mol-data/structure/model/properties/transforms.ts
index 9c6fdc4655fc7425ef5174b719fb0a54385e1628..42d9b7797614f887871b1196fd5816ceef643987 100644
--- a/src/mol-data/structure/model/properties/transforms.ts
+++ b/src/mol-data/structure/model/properties/transforms.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/model/utils/hierarchy-keys.ts b/src/mol-data/structure/model/utils/hierarchy-keys.ts
index 0b00badb9f1d53438940392d767eaaf64bb3e916..cc0f4821a2fd7cab9a573d58179205c562a5cc04 100644
--- a/src/mol-data/structure/model/utils/hierarchy-keys.ts
+++ b/src/mol-data/structure/model/utils/hierarchy-keys.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/query.ts b/src/mol-data/structure/query.ts
index 4a8bf6150e5b28990211f94ea72ea9a5e1cb7559..f876fabb493f0998a2259402c880ffd1071b32d4 100644
--- a/src/mol-data/structure/query.ts
+++ b/src/mol-data/structure/query.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/query/generators.ts b/src/mol-data/structure/query/generators.ts
index 9a30d0a3dd643ba7230c8eee198ee13386e50ea5..0479437b9281dbc2bccdc17bfe12f1588a888ce3 100644
--- a/src/mol-data/structure/query/generators.ts
+++ b/src/mol-data/structure/query/generators.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/query/properties.ts b/src/mol-data/structure/query/properties.ts
index 18bf1d5cb4451ad4313b88da93e192da254d1951..858ebb8fb7f0b8aa7208be26d5a1728d1438f0a3 100644
--- a/src/mol-data/structure/query/properties.ts
+++ b/src/mol-data/structure/query/properties.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/query/query.ts b/src/mol-data/structure/query/query.ts
index f3bd96b69fb723cb3157b3b44575a234f84b1623..20c569b6d96b66351c2aca3fb2837f056bb47c49 100644
--- a/src/mol-data/structure/query/query.ts
+++ b/src/mol-data/structure/query/query.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/query/selection.ts b/src/mol-data/structure/query/selection.ts
index 12665724756c159332e8b7a61cdf8de73be8668d..48f96ec4913b3c54ae091a98ffdb564c968d57e7 100644
--- a/src/mol-data/structure/query/selection.ts
+++ b/src/mol-data/structure/query/selection.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/structure.ts b/src/mol-data/structure/structure.ts
index cc8bf49f34d41cddcc8c0333a9125dcf4a69137b..1ceba8e5a8e0486cd28a7186f41ad85df1ae9987 100644
--- a/src/mol-data/structure/structure.ts
+++ b/src/mol-data/structure/structure.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/structure/atom.ts b/src/mol-data/structure/structure/atom.ts
index f40e08de9956d15bf6ee27532d25fbb8195329ef..cdc5b1302c2922ff7efdd4c8d14824547853b360 100644
--- a/src/mol-data/structure/structure/atom.ts
+++ b/src/mol-data/structure/structure/atom.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/structure/atom/set.ts b/src/mol-data/structure/structure/atom/set.ts
index ecf18643999b61b4a17b68ae23563223ccfd1119..93a2177949c73603dce5ba069718101c90ecb1e4 100644
--- a/src/mol-data/structure/structure/atom/set.ts
+++ b/src/mol-data/structure/structure/atom/set.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/structure/atom/set/builder.ts b/src/mol-data/structure/structure/atom/set/builder.ts
index 7c27a2fe8f023b299c0216a88d46443e1665f435..2d51dc9c5f7ae2a574695d52ebc84e06854065d7 100644
--- a/src/mol-data/structure/structure/atom/set/builder.ts
+++ b/src/mol-data/structure/structure/atom/set/builder.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/structure/atom/set/impl.ts b/src/mol-data/structure/structure/atom/set/impl.ts
index ebd2fcf4a8ff7fa9537b35fc040f1bdb85847075..dbb0974826fc6cd440ec8fcdddc85350f596b741 100644
--- a/src/mol-data/structure/structure/atom/set/impl.ts
+++ b/src/mol-data/structure/structure/atom/set/impl.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/structure/atom/set/properties.ts b/src/mol-data/structure/structure/atom/set/properties.ts
index 6e5dfe5935f5be1039b929228339dc5e405c0404..03ae27d163b402e0026bcfefd54bd706739187a0 100644
--- a/src/mol-data/structure/structure/atom/set/properties.ts
+++ b/src/mol-data/structure/structure/atom/set/properties.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/structure/operator.ts b/src/mol-data/structure/structure/operator.ts
index b2e5e78110ffe2f3a02b606b5eefd03085a84438..dd1df5c18cf4d1ad2add8429adf8424bbe2d1e31 100644
--- a/src/mol-data/structure/structure/operator.ts
+++ b/src/mol-data/structure/structure/operator.ts
@@ -1,10 +1,10 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
 
-import { Mat4 } from 'mol-base/math/linear-algebra'
+import { Mat4 } from 'mol-base/math/linear-algebra-3d'
 
 interface Operator extends Readonly<{
     name: string,
diff --git a/src/mol-data/structure/structure/structure.ts b/src/mol-data/structure/structure/structure.ts
index 14c10d4c7d893893aa38998caf92f5a2426d7c58..8917e842b52a194f47f93176d566fc9eb484be2d 100644
--- a/src/mol-data/structure/structure/structure.ts
+++ b/src/mol-data/structure/structure/structure.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-data/structure/structure/unit.ts b/src/mol-data/structure/structure/unit.ts
index 5ffc3d6ee09cdab4c7328148968e37b86fb1c49b..a90e87c243b16b9b4b649d5f22ce704bae23ff4c 100644
--- a/src/mol-data/structure/structure/unit.ts
+++ b/src/mol-data/structure/structure/unit.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/_spec/cif.spec.ts b/src/mol-io/reader/_spec/cif.spec.ts
index cf35dc3e90be92fb68c637f9efb0a3852a6ae1bb..24ee319dfdf50a715267c82379f31f11b20050b4 100644
--- a/src/mol-io/reader/_spec/cif.spec.ts
+++ b/src/mol-io/reader/_spec/cif.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/_spec/column.spec.ts b/src/mol-io/reader/_spec/column.spec.ts
index 27f0a4e8b44e4021d492b35ffa4477a2a817a468..f7df7dfc88d90a7d17329b47236494f16a8c16b5 100644
--- a/src/mol-io/reader/_spec/column.spec.ts
+++ b/src/mol-io/reader/_spec/column.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/reader/_spec/gro.spec.ts b/src/mol-io/reader/_spec/gro.spec.ts
index 8f78668d57ecbd56112343447211b0e9e4fad6b6..e13fcf713a9b0fa7daec2d452e3c75c1ac9b3b1c 100644
--- a/src/mol-io/reader/_spec/gro.spec.ts
+++ b/src/mol-io/reader/_spec/gro.spec.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/reader/cif.ts b/src/mol-io/reader/cif.ts
index 1a57f99fe09e4860b1cbf8d75f64f7ddab5c4014..7e2782710310b5f599b9cb71d811703c16c81413 100644
--- a/src/mol-io/reader/cif.ts
+++ b/src/mol-io/reader/cif.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/cif/binary/decoder.ts b/src/mol-io/reader/cif/binary/decoder.ts
index a9e43acbe6e57941ebf93be7aef03abc35c968f6..d1620bfac77c4f08ea30c7dd87a67ebdfd9be067 100644
--- a/src/mol-io/reader/cif/binary/decoder.ts
+++ b/src/mol-io/reader/cif/binary/decoder.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * From CIFTools.js
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/reader/cif/binary/encoding.ts b/src/mol-io/reader/cif/binary/encoding.ts
index 6bf50cf1a8db22ee8fc4657b3cff4208965b4cf9..f36abc52790b011b41a9737f78636b781f2f73c3 100644
--- a/src/mol-io/reader/cif/binary/encoding.ts
+++ b/src/mol-io/reader/cif/binary/encoding.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * From CIFTools.js
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/reader/cif/binary/field.ts b/src/mol-io/reader/cif/binary/field.ts
index 5d08ce21888ca8d411a1e825d2c66e0940df8544..c11f1909c565f9807a11d53ab239716f8441a276 100644
--- a/src/mol-io/reader/cif/binary/field.ts
+++ b/src/mol-io/reader/cif/binary/field.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/cif/binary/parser.ts b/src/mol-io/reader/cif/binary/parser.ts
index 0225eab255553f28fa39cd25e318a328c72d89e0..0d0614a7692608c39befd53af1e1c0471a4b1fb2 100644
--- a/src/mol-io/reader/cif/binary/parser.ts
+++ b/src/mol-io/reader/cif/binary/parser.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/cif/data-model.ts b/src/mol-io/reader/cif/data-model.ts
index 3153731627882a35a49cbba7e60944c2d02d1f81..2f72463e96da85d12d9534c973ea77d88d09e96e 100644
--- a/src/mol-io/reader/cif/data-model.ts
+++ b/src/mol-io/reader/cif/data-model.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/cif/schema.ts b/src/mol-io/reader/cif/schema.ts
index 5f1c5aa6b9a0403527ad7262e105edc886f22ecc..c4b0dc333dcb3b48e2212b6cf5f980164462ce04 100644
--- a/src/mol-io/reader/cif/schema.ts
+++ b/src/mol-io/reader/cif/schema.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/cif/schema/dic.ts b/src/mol-io/reader/cif/schema/dic.ts
index 712a667f4e12b7c0b09860dbdd557ab6bf726444..09e0d5b60fe6794a8beab76f5123798355a5f701 100644
--- a/src/mol-io/reader/cif/schema/dic.ts
+++ b/src/mol-io/reader/cif/schema/dic.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
diff --git a/src/mol-io/reader/cif/schema/mmcif.ts b/src/mol-io/reader/cif/schema/mmcif.ts
index 9f478aa5c0aa07b1c5548b34f1523ed0d807a040..42aabd396c9cc9bf9d0267f2a21153296de4f417 100644
--- a/src/mol-io/reader/cif/schema/mmcif.ts
+++ b/src/mol-io/reader/cif/schema/mmcif.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/cif/schema/utils.ts b/src/mol-io/reader/cif/schema/utils.ts
index 072257addba3f27eae13deb2b03b4042de50684b..eab1cb1d7fbe9a90ca1b87b5ed6fcc13145407ae 100644
--- a/src/mol-io/reader/cif/schema/utils.ts
+++ b/src/mol-io/reader/cif/schema/utils.ts
@@ -116,7 +116,7 @@ function getCode (d: Data.Frame, ctx: FrameData): [string, string[]]|undefined {
 }
 
 const header = `/**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Your friendly code generator
  */
diff --git a/src/mol-io/reader/cif/text/field.ts b/src/mol-io/reader/cif/text/field.ts
index 2dd357812e59efc4d02dc61d7b35c5f03570dded..1628da3e4461fa55d2c00abd551f3ed77662b902 100644
--- a/src/mol-io/reader/cif/text/field.ts
+++ b/src/mol-io/reader/cif/text/field.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/cif/text/parser.ts b/src/mol-io/reader/cif/text/parser.ts
index e657ee4eb244bbb282fd7c1f24734c81e77021ae..cf705c7aefc6f0eccf8a2d167564bb23b3de47f5 100644
--- a/src/mol-io/reader/cif/text/parser.ts
+++ b/src/mol-io/reader/cif/text/parser.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/common/binary/column.ts b/src/mol-io/reader/common/binary/column.ts
index 28ce9a00172e698d50f8e908a3908248acf2ccb9..0a8bc85d73c596f6305bdebe8c2561282fec9b1f 100644
--- a/src/mol-io/reader/common/binary/column.ts
+++ b/src/mol-io/reader/common/binary/column.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
\ No newline at end of file
diff --git a/src/mol-io/reader/common/text/column/fixed.ts b/src/mol-io/reader/common/text/column/fixed.ts
index 6438f3728c5711cd944cd925782bfa73f2f0eb77..d279f3f2eb02d9867eacaeeab9fa7fc090c15b4a 100644
--- a/src/mol-io/reader/common/text/column/fixed.ts
+++ b/src/mol-io/reader/common/text/column/fixed.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/common/text/column/token.ts b/src/mol-io/reader/common/text/column/token.ts
index e80027e92dbcf539f89797843e1eee239c5370d6..e4dd79fe341fab5b933c23e77cf3b1ec760ccf26 100644
--- a/src/mol-io/reader/common/text/column/token.ts
+++ b/src/mol-io/reader/common/text/column/token.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/mol-io/reader/common/text/number-parser.ts b/src/mol-io/reader/common/text/number-parser.ts
index f7b097f8241b7b70cb98f8eec9d05484626b18bd..664b0f04c6bb0dcfee34faf5e0fc589ad84cfd5f 100644
--- a/src/mol-io/reader/common/text/number-parser.ts
+++ b/src/mol-io/reader/common/text/number-parser.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * from https://github.com/dsehnal/CIFTools.js
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/reader/common/text/tokenizer.ts b/src/mol-io/reader/common/text/tokenizer.ts
index 2d48a3fc1974804a00e8118d66928439029de9da..d8ddc0746eb72ea6431de303b6a4d1f3fe6e6b77 100644
--- a/src/mol-io/reader/common/text/tokenizer.ts
+++ b/src/mol-io/reader/common/text/tokenizer.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * mostly from https://github.com/dsehnal/CIFTools.js
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/reader/gro/parser.ts b/src/mol-io/reader/gro/parser.ts
index 3210578239c85fc0fe49c6d6e7761808e7166d83..531a8b2756c20c9fb0caad75bf42ef1f8653322f 100644
--- a/src/mol-io/reader/gro/parser.ts
+++ b/src/mol-io/reader/gro/parser.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/reader/gro/schema.d.ts b/src/mol-io/reader/gro/schema.d.ts
index 8f9cfdf5875abd4b2689ce2d1ddf135d88884ad2..bd871b6ffea6cdc127ce4b375888548ce28d1a60 100644
--- a/src/mol-io/reader/gro/schema.d.ts
+++ b/src/mol-io/reader/gro/schema.d.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/reader/mol2/schema.d.ts b/src/mol-io/reader/mol2/schema.d.ts
index 8bbf35cec494c25723fd6f9a24c6d8df059b8e7a..fbf458ce8322b10d7ad28659a886f468c9492bec 100644
--- a/src/mol-io/reader/mol2/schema.d.ts
+++ b/src/mol-io/reader/mol2/schema.d.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
diff --git a/src/mol-io/reader/result.ts b/src/mol-io/reader/result.ts
index a6b29f0200e2e1d84ceced57977b916311025cd9..4eb76dd373929b858e09e2de3d7f649abd078f86 100644
--- a/src/mol-io/reader/result.ts
+++ b/src/mol-io/reader/result.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * from https://github.com/dsehnal/CIFTools.js
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/utils/msgpack/decode.ts b/src/mol-io/utils/msgpack/decode.ts
index 3c43aefcb9192429059934b0d4a499b5de76ae1f..5d465550eab4b6e0a6eb1ccfbb6e811f9d72afdd 100644
--- a/src/mol-io/utils/msgpack/decode.ts
+++ b/src/mol-io/utils/msgpack/decode.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * Adapted from https://github.com/rcsb/mmtf-javascript
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
diff --git a/src/mol-io/utils/msgpack/encode.ts b/src/mol-io/utils/msgpack/encode.ts
index 7056ceebe5fd1bd23f7af085dbd1383b61568b00..fb79a65496c56c1dc40e9667b805092b84d1770e 100644
--- a/src/mol-io/utils/msgpack/encode.ts
+++ b/src/mol-io/utils/msgpack/encode.ts
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * Adapted from https://github.com/rcsb/mmtf-javascript
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
diff --git a/src/mol-io/utils/short-string-pool.ts b/src/mol-io/utils/short-string-pool.ts
index 870284bcca01277b4620dc6ce72aa0ae18fc013a..58858c1a876da86df9f6e76fad6f82aa51d8d5e3 100644
--- a/src/mol-io/utils/short-string-pool.ts
+++ b/src/mol-io/utils/short-string-pool.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * from https://github.com/dsehnal/CIFTools.js
  * @author David Sehnal <david.sehnal@gmail.com>
diff --git a/src/mol-io/utils/utf8.ts b/src/mol-io/utils/utf8.ts
index ff7c8a6fb7ef0d374e99b160f969b3a70d260f5e..74f35811b389c4b4dd1e2266422cd6f028e52fdf 100644
--- a/src/mol-io/utils/utf8.ts
+++ b/src/mol-io/utils/utf8.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * Adapted from https://github.com/rcsb/mmtf-javascript
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
diff --git a/src/perf-tests/structure.ts b/src/perf-tests/structure.ts
index a1d996834a8da7cdd11d19030045e2ca4d3fbb5a..23300ac6a0e8545075ea87e8e25ee39a79e2f987 100644
--- a/src/perf-tests/structure.ts
+++ b/src/perf-tests/structure.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author David Sehnal <david.sehnal@gmail.com>
  */
diff --git a/src/script.ts b/src/script.ts
index 8207880be1ce4cd3bcea5794b6aca404a0c59a03..05b1c962baec312b290d00d099f0cb1aac8c44f9 100644
--- a/src/script.ts
+++ b/src/script.ts
@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2017 molio contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2017 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>