diff --git a/test/log-append.spec.js b/test/oplog/append.test.js
similarity index 95%
rename from test/log-append.spec.js
rename to test/oplog/append.test.js
index c93b8cd..e40634d 100644
--- a/test/log-append.spec.js
+++ b/test/oplog/append.test.js
@@ -1,10 +1,10 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../src/log.js'
-import MemoryStorage from '../src/storage/memory.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
+import Log from '../../src/log.js'
+import MemoryStorage from '../../src/storage/memory.js'
+import IdentityProvider from '../../src/identities/index.js'
+import KeyStore from '../../src/key-store.js'
 
 // Test utils
 import { config, testAPIs } from 'orbit-db-test-utils'
diff --git a/test/log-crdt.spec.js b/test/oplog/crdt.test.js
similarity index 97%
rename from test/log-crdt.spec.js
rename to test/oplog/crdt.test.js
index 048bc14..d82f09e 100644
--- a/test/log-crdt.spec.js
+++ b/test/oplog/crdt.test.js
@@ -1,10 +1,10 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../src/log.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
-import MemoryStorage from '../src/storage/memory.js'
+import Log from '../../src/log.js'
+import IdentityProvider from '../../src/identities/index.js'
+import KeyStore from '../../src/key-store.js'
+import MemoryStorage from '../../src/storage/memory.js'
 
 // Test utils
 import { config, testAPIs } from 'orbit-db-test-utils'
diff --git a/test/entry.spec.js b/test/oplog/entry.test.js
similarity index 97%
rename from test/entry.spec.js
rename to test/oplog/entry.test.js
index 9ad48c8..008fe23 100644
--- a/test/entry.spec.js
+++ b/test/oplog/entry.test.js
@@ -1,9 +1,9 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Entry from '../src/entry.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
+import Entry from '../../src/entry.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'
 // import IdentityStorage from '../src/identity-storage.js'
 // import IPFSBlockStorage from '../src/ipfs-block-storage.js'
diff --git a/test/log-heads.spec.js b/test/oplog/heads.test.js
similarity index 96%
rename from test/log-heads.spec.js
rename to test/oplog/heads.test.js
index fa33779..0545d01 100644
--- a/test/log-heads.spec.js
+++ b/test/oplog/heads.test.js
@@ -1,10 +1,10 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../src/log.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
-import MemoryStorage from '../src/storage/memory.js'
+import Log from '../../src/log.js'
+import IdentityProvider from '../../src/identities/index.js'
+import KeyStore from '../../src/key-store.js'
+import MemoryStorage from '../../src/storage/memory.js'
 
 // Test utils
 import { config, testAPIs } from 'orbit-db-test-utils'
diff --git a/test/log-iterator.spec.js b/test/oplog/iterator.test.js
similarity index 97%
rename from test/log-iterator.spec.js
rename to test/oplog/iterator.test.js
index 4e8922e..8d0030e 100644
--- a/test/log-iterator.spec.js
+++ b/test/oplog/iterator.test.js
@@ -1,15 +1,15 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../src/log.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.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'
 import all from 'it-all'
-import MemoryStorage from '../src/storage/memory.js'
+import MemoryStorage from '../../src/storage/memory.js'
 
 // Test utils
 import { config, testAPIs, startIpfs, stopIpfs } from 'orbit-db-test-utils'
-import { identityKeys, signingKeys } from './fixtures/orbit-db-identity-keys.js'
+import { identityKeys, signingKeys } from '../fixtures/orbit-db-identity-keys.js'
 
 const { sync: rmrf } = rimraf
 const { createIdentity } = IdentityProvider
diff --git a/test/log-join-concurrent.spec.js b/test/oplog/join-concurrent.test.js
similarity index 93%
rename from test/log-join-concurrent.spec.js
rename to test/oplog/join-concurrent.test.js
index 2931fe2..89aa767 100644
--- a/test/log-join-concurrent.spec.js
+++ b/test/oplog/join-concurrent.test.js
@@ -1,10 +1,10 @@
 import { strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../src/log.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
-import MemoryStorage from '../src/storage/memory.js'
+import Log from '../../src/log.js'
+import IdentityProvider from '../../src/identities/index.js'
+import KeyStore from '../../src/key-store.js'
+import MemoryStorage from '../../src/storage/memory.js'
 
 // Test utils
 import { config, testAPIs } from 'orbit-db-test-utils'
diff --git a/test/log-join.spec.js b/test/oplog/join.test.js
similarity index 97%
rename from test/log-join.spec.js
rename to test/oplog/join.test.js
index 16e7af3..a23d16e 100644
--- a/test/log-join.spec.js
+++ b/test/oplog/join.test.js
@@ -1,14 +1,14 @@
 import { strictEqual, notStrictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Clock from '../src/lamport-clock.js'
-import Log from '../src/log.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
-import MemoryStorage from '../src/storage/memory.js'
+import Clock from '../../src/lamport-clock.js'
+import Log from '../../src/log.js'
+import IdentityProvider from '../../src/identities/index.js'
+import KeyStore from '../../src/key-store.js'
+import MemoryStorage from '../../src/storage/memory.js'
 
 // Test utils
 import { config, testAPIs } from 'orbit-db-test-utils'
-import { identityKeys, signingKeys } from './fixtures/orbit-db-identity-keys.js'
+import { identityKeys, signingKeys } from '../fixtures/orbit-db-identity-keys.js'
 
 const { sync: rmrf } = rimraf
 const { createIdentity } = IdentityProvider
diff --git a/test/log-load.spec.js b/test/oplog/load.test.js
similarity index 98%
rename from test/log-load.spec.js
rename to test/oplog/load.test.js
index 2603d9c..a77039f 100644
--- a/test/log-load.spec.js
+++ b/test/oplog/load.test.js
@@ -1,14 +1,14 @@
 import { strictEqual, deepStrictEqual, notStrictEqual, throws } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Sorting from '../src/sorting/log.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 Sorting from '../../src/sorting/log.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'
-import MemoryStorage from '../src/storage/memory.js'
+import MemoryStorage from '../../src/storage/memory.js'
 
 // Test utils
 import { config, MemStore, testAPIs, startIpfs, stopIpfs } from 'orbit-db-test-utils'
diff --git a/test/log.spec.js b/test/oplog/log.spec.js
similarity index 96%
rename from test/log.spec.js
rename to test/oplog/log.spec.js
index 80ce10d..d8a3ce3 100644
--- a/test/log.spec.js
+++ b/test/oplog/log.spec.js
@@ -1,11 +1,11 @@
 import { notStrictEqual, deepStrictEqual, strictEqual } from 'assert'
 import rimraf from 'rimraf'
-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 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 { copy } from 'fs-extra'
-import MemoryStorage from '../src/storage/memory.js'
+import MemoryStorage from '../../src/storage/memory.js'
 
 // Test utils
 import { config, testAPIs } from 'orbit-db-test-utils'
diff --git a/test/log-references.spec.js b/test/oplog/references.test.js
similarity index 97%
rename from test/log-references.spec.js
rename to test/oplog/references.test.js
index 675683b..f9b32c4 100644
--- a/test/log-references.spec.js
+++ b/test/oplog/references.test.js
@@ -1,10 +1,10 @@
 import { strictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import Log from '../src/log.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
-import MemoryStorage from '../src/storage/memory.js'
+import Log from '../../src/log.js'
+import IdentityProvider from '../../src/identities/index.js'
+import KeyStore from '../../src/key-store.js'
+import MemoryStorage from '../../src/storage/memory.js'
 
 // Test utils
 import { config, testAPIs } from 'orbit-db-test-utils'
diff --git a/test/replicate.spec.js b/test/oplog/replicate.spec.js
similarity index 96%
rename from test/replicate.spec.js
rename to test/oplog/replicate.spec.js
index 7482ebf..1d4f352 100644
--- a/test/replicate.spec.js
+++ b/test/oplog/replicate.spec.js
@@ -1,10 +1,10 @@
 import { strictEqual } from 'assert'
 import rimraf from 'rimraf'
 import { copy } from 'fs-extra'
-import { Log, Entry } from '../src/index.js'
-import { MemoryStorage, IPFSBlockStorage } from '../src/storage/index.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
+import { Log, Entry } from '../../src/index.js'
+import { MemoryStorage, IPFSBlockStorage } from '../../src/storage/index.js'
+import IdentityProvider from '../../src/identities/index.js'
+import KeyStore from '../../src/key-store.js'
 
 // Test utils
 import { config, testAPIs, startIpfs, stopIpfs, getIpfsPeerId, waitForPeers, connectPeers } from 'orbit-db-test-utils'
diff --git a/test/signed-log.spec.js b/test/oplog/signed-log.spec.js
similarity index 96%
rename from test/signed-log.spec.js
rename to test/oplog/signed-log.spec.js
index db05e85..7c8cada 100644
--- a/test/signed-log.spec.js
+++ b/test/oplog/signed-log.spec.js
@@ -1,12 +1,12 @@
 import { notStrictEqual, strictEqual, deepStrictEqual } from 'assert'
 import rimraf from 'rimraf'
-import Log from '../src/log.js'
-import IdentityProvider from '../src/identities/index.js'
-import KeyStore from '../src/key-store.js'
+import Log from '../../src/log.js'
+import IdentityProvider from '../../src/identities/index.js'
+import KeyStore from '../../src/key-store.js'
 
 // Test utils
 import { config, testAPIs } from 'orbit-db-test-utils'
-import { identityKeys, signingKeys, createTestIdentities, cleanUpTestIdentities } from './fixtures/orbit-db-identity-keys.js'
+import { identityKeys, signingKeys, createTestIdentities, cleanUpTestIdentities } from '../fixtures/orbit-db-identity-keys.js'
 
 const { sync: rmrf } = rimraf
 const { createIdentity } = IdentityProvider
diff --git a/test/utils/log-creator.js b/test/oplog/utils/log-creator.js
similarity index 100%
rename from test/utils/log-creator.js
rename to test/oplog/utils/log-creator.js