diff --git a/src/index.js b/src/index.js
index 5a485c4..a5b2031 100644
--- a/src/index.js
+++ b/src/index.js
@@ -1,3 +1,2 @@
-export { default as Log, DefaultAccessController } from './log.js'
-export { default as Entry } from './entry.js'
+export { Log, DefaultAccessController, Entry } from './oplog/index.js'
 export { default as KeyStore } from './key-store.js'
diff --git a/src/entry.js b/src/oplog/entry.js
similarity index 98%
rename from src/entry.js
rename to src/oplog/entry.js
index f1ae1f9..afcfd09 100644
--- a/src/entry.js
+++ b/src/oplog/entry.js
@@ -1,9 +1,9 @@
 import Clock from './lamport-clock.js'
-import { isDefined } from './utils/index.js'
 import * as Block from 'multiformats/block'
 import * as dagCbor from '@ipld/dag-cbor'
 import { sha256 } from 'multiformats/hashes/sha2'
 import { base58btc } from 'multiformats/bases/base58'
+import { isDefined } from '../utils/index.js'
 
 /*
  * @description
diff --git a/src/heads.js b/src/oplog/heads.js
similarity index 97%
rename from src/heads.js
rename to src/oplog/heads.js
index 13292c7..353ae51 100644
--- a/src/heads.js
+++ b/src/oplog/heads.js
@@ -1,5 +1,5 @@
 import Entry from './entry.js'
-import MemoryStorage from './storage/memory.js'
+import MemoryStorage from '../storage/memory.js'
 
 const DefaultStorage = MemoryStorage
 
diff --git a/src/oplog/index.js b/src/oplog/index.js
new file mode 100644
index 0000000..6893808
--- /dev/null
+++ b/src/oplog/index.js
@@ -0,0 +1,4 @@
+export { default as Log, DefaultAccessController } from './log.js'
+export { default as Entry } from './entry.js'
+export { default as Clock } from './lamport-clock.js'
+export { default as Sorting } from './sorting.js'
diff --git a/src/lamport-clock.js b/src/oplog/lamport-clock.js
similarity index 100%
rename from src/lamport-clock.js
rename to src/oplog/lamport-clock.js
diff --git a/src/log.js b/src/oplog/log.js
similarity index 99%
rename from src/log.js
rename to src/oplog/log.js
index ee87c3f..8a53bc4 100644
--- a/src/log.js
+++ b/src/oplog/log.js
@@ -2,13 +2,13 @@ import LRU from 'lru'
 import Entry from './entry.js'
 import Clock from './lamport-clock.js'
 import Heads from './heads.js'
-import Sorting from './sorting/log.js'
-import MemoryStorage from './storage/memory.js'
+import Sorting from './sorting.js'
+import MemoryStorage from '../storage/memory.js'
 // import LRUStorage from './storage/lru.js'
 // import LevelStorage from './storage/level.js'
 // import IPFSBlockStorage from './storage/ipfs-block.js'
 // import ComposedStorage from './storage/composed.js'
-import { isDefined } from './utils/index.js'
+import { isDefined } from '../utils/index.js'
 
 const { LastWriteWins, NoZeroes } = Sorting
 
diff --git a/src/sorting/log.js b/src/oplog/sorting.js
similarity index 98%
rename from src/sorting/log.js
rename to src/oplog/sorting.js
index ad6af0a..98da9f8 100644
--- a/src/sorting/log.js
+++ b/src/oplog/sorting.js
@@ -1,4 +1,4 @@
-import Clock from '../lamport-clock.js'
+import Clock from './lamport-clock.js'
 
 /**
  * Sort two entries as Last-Write-Wins (LWW).
diff --git a/src/sorting/index.js b/src/sorting/index.js
deleted file mode 100644
index 34f1dbc..0000000
--- a/src/sorting/index.js
+++ /dev/null
@@ -1 +0,0 @@
-export { LogSorting } from './src/log.js'
diff --git a/test/document-store.spec.js b/test/document-store.spec.js
index 2282503..f2a9ba5 100644
--- a/test/document-store.spec.js
+++ b/test/document-store.spec.js
@@ -1,7 +1,6 @@
 import { deepStrictEqual, strictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../src/log.js'
-import Entry from '../src/entry.js'
+import { Log, Entry } from '../src/oplog/index.js'
 import IdentityProvider from '../src/identities/index.js'
 import KeyStore from '../src/key-store.js'
 import { DocumentStore, Database } from '../src/db/index.js'
diff --git a/test/event-store.spec.js b/test/event-store.spec.js
index 2ace0ff..e4884d2 100644
--- a/test/event-store.spec.js
+++ b/test/event-store.spec.js
@@ -1,7 +1,6 @@
 import { deepStrictEqual, strictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../src/log.js'
-import Entry from '../src/entry.js'
+import { Log, Entry } from '../src/oplog/index.js'
 import IdentityProvider from '../src/identities/index.js'
 import KeyStore from '../src/key-store.js'
 import { EventStore, Database } from '../src/db/index.js'
diff --git a/test/feed.spec.js b/test/feed.spec.js
index 18b8741..65138c9 100644
--- a/test/feed.spec.js
+++ b/test/feed.spec.js
@@ -1,7 +1,6 @@
 import { deepStrictEqual, strictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../src/log.js'
-import Entry from '../src/entry.js'
+import { Log, Entry } from '../src/oplog/index.js'
 import IdentityProvider from '../src/identities/index.js'
 import KeyStore from '../src/key-store.js'
 import { Feed, Database } from '../src/db/index.js'
diff --git a/test/keyvalue.spec.js b/test/keyvalue.spec.js
index 6c5416c..9267f61 100644
--- a/test/keyvalue.spec.js
+++ b/test/keyvalue.spec.js
@@ -1,7 +1,6 @@
 import { deepStrictEqual, strictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../src/log.js'
-import Entry from '../src/entry.js'
+import { Log, Entry } from '../src/oplog/index.js'
 import IdentityProvider from '../src/identities/index.js'
 import KeyStore from '../src/key-store.js'
 import { KeyValue, KeyValuePersisted, Database } from '../src/db/index.js'
diff --git a/test/oplog/append.test.js b/test/oplog/append.test.js
index e40634d..4e3b767 100644
--- a/test/oplog/append.test.js
+++ b/test/oplog/append.test.js
@@ -1,7 +1,7 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../../src/log.js'
+import { Log } from '../../src/oplog/index.js'
 import MemoryStorage from '../../src/storage/memory.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
diff --git a/test/oplog/crdt.test.js b/test/oplog/crdt.test.js
index d82f09e..8bf6a41 100644
--- a/test/oplog/crdt.test.js
+++ b/test/oplog/crdt.test.js
@@ -1,7 +1,7 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../../src/log.js'
+import { Log } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import MemoryStorage from '../../src/storage/memory.js'
diff --git a/test/oplog/entry.test.js b/test/oplog/entry.test.js
index 008fe23..dd4e603 100644
--- a/test/oplog/entry.test.js
+++ b/test/oplog/entry.test.js
@@ -1,7 +1,7 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Entry from '../../src/entry.js'
+import { Entry } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import { config, testAPIs, startIpfs, stopIpfs } from 'orbit-db-test-utils'
diff --git a/test/oplog/heads.test.js b/test/oplog/heads.test.js
index 0545d01..40830b4 100644
--- a/test/oplog/heads.test.js
+++ b/test/oplog/heads.test.js
@@ -1,7 +1,7 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../../src/log.js'
+import { Log } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import MemoryStorage from '../../src/storage/memory.js'
diff --git a/test/oplog/iterator.test.js b/test/oplog/iterator.test.js
index 8d0030e..ce3951d 100644
--- a/test/oplog/iterator.test.js
+++ b/test/oplog/iterator.test.js
@@ -1,6 +1,6 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../../src/log.js'
+import { Log } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import LogCreator from './utils/log-creator.js'
diff --git a/test/oplog/join-concurrent.test.js b/test/oplog/join-concurrent.test.js
index 89aa767..9436ce2 100644
--- a/test/oplog/join-concurrent.test.js
+++ b/test/oplog/join-concurrent.test.js
@@ -1,7 +1,7 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../../src/log.js'
+import { Log } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import MemoryStorage from '../../src/storage/memory.js'
diff --git a/test/oplog/join.test.js b/test/oplog/join.test.js
index a23d16e..7870e52 100644
--- a/test/oplog/join.test.js
+++ b/test/oplog/join.test.js
@@ -1,7 +1,6 @@
 import { strictEqual, notStrictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Clock from '../../src/lamport-clock.js'
-import Log from '../../src/log.js'
+import { Log, Clock } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import MemoryStorage from '../../src/storage/memory.js'
diff --git a/test/oplog/load.test.js b/test/oplog/load.test.js
index a77039f..e83effa 100644
--- a/test/oplog/load.test.js
+++ b/test/oplog/load.test.js
@@ -1,10 +1,8 @@
 import { strictEqual, deepStrictEqual, notStrictEqual, throws } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Sorting from '../../src/sorting/log.js'
+import { Log, Entry, Sorting } from '../../src/oplog/index.js'
 import bigLogString from '../fixtures/big-log.fixture.js'
-import Entry from '../../src/entry.js'
-import Log from '../../src/log.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import LogCreator from './utils/log-creator.js'
diff --git a/test/oplog/log.spec.js b/test/oplog/log.spec.js
index d8a3ce3..3a5915b 100644
--- a/test/oplog/log.spec.js
+++ b/test/oplog/log.spec.js
@@ -1,7 +1,6 @@
 import { notStrictEqual, deepStrictEqual, strictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Entry from '../../src/entry.js'
-import Log from '../../src/log.js'
+import { Log, Entry } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import { copy } from 'fs-extra'
diff --git a/test/oplog/references.test.js b/test/oplog/references.test.js
index f9b32c4..ca19cd7 100644
--- a/test/oplog/references.test.js
+++ b/test/oplog/references.test.js
@@ -1,7 +1,7 @@
 import { strictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../../src/log.js'
+import { Log } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 import MemoryStorage from '../../src/storage/memory.js'
diff --git a/test/oplog/signed-log.spec.js b/test/oplog/signed-log.spec.js
index 7c8cada..516c591 100644
--- a/test/oplog/signed-log.spec.js
+++ b/test/oplog/signed-log.spec.js
@@ -1,6 +1,6 @@
 import { notStrictEqual, strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../../src/log.js'
+import { Log } from '../../src/oplog/index.js'
 import IdentityProvider from '../../src/identities/index.js'
 import KeyStore from '../../src/key-store.js'
 
diff --git a/test/storage.spec.js b/test/storage.spec.js
index 7f7aa4d..b06d6b3 100644
--- a/test/storage.spec.js
+++ b/test/storage.spec.js
@@ -1,10 +1,10 @@
 import * as IPFS from 'ipfs'
 import { strictEqual, notStrictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../src/log.js'
-import { IPFSBlockStorage, MemoryStorage, LRUStorage, ComposedStorage } from '../src/storage/index.js'
+import { Log } from '../src/oplog/index.js'
 import IdentityProvider from '../src/identities/index.js'
 import KeyStore from '../src/key-store.js'
+import { IPFSBlockStorage, MemoryStorage, LRUStorage, ComposedStorage } from '../src/storage/index.js'
 import { copy } from 'fs-extra'
 
 // Test utils