diff --git a/.wallaby-client.js b/.wallaby-client.js
index f245a7e..6fff363 100644
--- a/.wallaby-client.js
+++ b/.wallaby-client.js
@@ -3,7 +3,7 @@ module.exports = function (wallaby) {
   const postprocessor = wallabify({
     entryPatterns: [
       'config/mocha.bootstrap.js',
-      'src/imports/adaptors/web/**/*spec.js'
+      'src/imports/ui/**/*spec.js'
     ]
   });
   return {
@@ -11,11 +11,11 @@ module.exports = function (wallaby) {
     testFramework: 'mocha',
     files: [
       {pattern: 'config/mocha.bootstrap.js', load: false, instrument: false},
-      {pattern: 'src/imports/adaptors/web/**/*.js', load: false},
-      {pattern: 'src/imports/adaptors/web/**/*spec.js', ignore: true},
+      {pattern: 'src/imports/ui/**/*.js', load: false},
+      {pattern: 'src/imports/ui/**/*spec.js', ignore: true},
     ],
     tests: [
-      {pattern: 'src/imports/adaptors/web/**/*spec.js', load: false},
+      {pattern: 'src/imports/ui/**/*spec.js', load: false},
     ],
     compilers: {
       '**/*.js': wallaby.compilers.babel()
diff --git a/config/karma.options.js b/config/karma.options.js
index 698dcd2..3f04b14 100644
--- a/config/karma.options.js
+++ b/config/karma.options.js
@@ -10,7 +10,7 @@ module.exports = {
     'source-map-support'      // allows us to see which source lines are cause failures when they occur
   ],
   files: [                    // the order in which to load the source and test files
-    'src/imports/adaptors/web/**/*.js'
+    'src/imports/ui/**/*.js'
   ],
   exclude: [                  // since karma is a front-end only testing framework, we ignore server directories
     'src/**/server/**',
diff --git a/src/imports/application/services/my-spec.js b/src/imports/application/services/my-spec.js
new file mode 100644
index 0000000..fea5a9a
--- /dev/null
+++ b/src/imports/application/services/my-spec.js
@@ -0,0 +1,5 @@
+describe('an application service', function () {
+  it('method', function () {
+    'hello'.should.be.a('string');
+  });
+});
diff --git a/src/imports/domain/my-spec.js b/src/imports/domain/model/my-spec.js
similarity index 64%
rename from src/imports/domain/my-spec.js
rename to src/imports/domain/model/my-spec.js
index e5a754c..924e9c6 100644
--- a/src/imports/domain/my-spec.js
+++ b/src/imports/domain/model/my-spec.js
@@ -1,4 +1,4 @@
-describe('a domain', function () {
+describe('a domain model', function () {
   it('entity', function () {
     'hello'.should.be.a('string');
   });
diff --git a/src/imports/adaptors/my-spec.js b/src/imports/domain/services/my-spec.js
similarity index 63%
rename from src/imports/adaptors/my-spec.js
rename to src/imports/domain/services/my-spec.js
index ef58d0b..3731932 100644
--- a/src/imports/adaptors/my-spec.js
+++ b/src/imports/domain/services/my-spec.js
@@ -1,4 +1,4 @@
-describe('an adaptor', function () {
+describe('a domain service', function () {
   it('method', function () {
     'hello'.should.be.a('string');
   });
diff --git a/src/imports/ports/my-spec.js b/src/imports/ports/my-spec.js
deleted file mode 100644
index 1e8be94..0000000
--- a/src/imports/ports/my-spec.js
+++ /dev/null
@@ -1,5 +0,0 @@
-describe('a port', function () {
-  it('command', function () {
-    'hello'.should.be.a('string');
-  });
-});
diff --git a/src/imports/adaptors/web/components/my-spec.js b/src/imports/ui/components/my-spec.js
similarity index 100%
rename from src/imports/adaptors/web/components/my-spec.js
rename to src/imports/ui/components/my-spec.js
diff --git a/src/imports/adaptors/web/pages/my-spec.js b/src/imports/ui/pages/my-spec.js
similarity index 100%
rename from src/imports/adaptors/web/pages/my-spec.js
rename to src/imports/ui/pages/my-spec.js