diff --git a/.gitignore b/.gitignore
index 79daed249..404782c9a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,7 +2,7 @@
 
 # Ignore any generated html files, but include the report html template
 *.html
-!/packages/caliper-core/lib/report/template/report.html
+!/packages/caliper-core/lib/master/report/template/report.html
 
 # Ignore DS_Store files from Mac
 **.DS_Store
diff --git a/packages/caliper-core/.gitignore b/packages/caliper-core/.gitignore
index 9b68215d9..4b0226dfe 100644
--- a/packages/caliper-core/.gitignore
+++ b/packages/caliper-core/.gitignore
@@ -2,7 +2,7 @@
 
 # Ignore any generated html files, but include the report html template
 *.html
-!/lib/report/template/report.html
+!/lib/master/report/template/report.html
 
 # Ignore DS_Store files from Mac
 **.DS_Store
diff --git a/packages/caliper-core/index.js b/packages/caliper-core/index.js
index abf8b61ae..74dc678db 100644
--- a/packages/caliper-core/index.js
+++ b/packages/caliper-core/index.js
@@ -14,10 +14,10 @@
 
 'use strict';
 
-module.exports.BlockchainInterface = require('./lib/blockchain-interface');
-module.exports.CaliperLocalClient = require('./lib/client/caliper-local-client');
-module.exports.TxStatus = require('./lib/transaction-status');
-module.exports.CaliperUtils = require('./lib/utils/caliper-utils');
-module.exports.Version = require('./lib/utils/version');
-module.exports.ConfigUtil = require('./lib/config/config-util');
-module.exports.CaliperFlow = require('./lib/caliper-flow');
+module.exports.BlockchainInterface = require('./lib/common/core/blockchain-interface');
+module.exports.CaliperLocalClient = require('./lib/worker/client/caliper-local-client');
+module.exports.TxStatus = require('./lib/common/core/transaction-status');
+module.exports.CaliperUtils = require('./lib/common/utils/caliper-utils');
+module.exports.Version = require('./lib/common/utils/version');
+module.exports.ConfigUtil = require('./lib/common/config/config-util');
+module.exports.CaliperFlow = require('./lib/master/caliper-flow');
diff --git a/packages/caliper-core/lib/config/Config.js b/packages/caliper-core/lib/common/config/Config.js
similarity index 100%
rename from packages/caliper-core/lib/config/Config.js
rename to packages/caliper-core/lib/common/config/Config.js
diff --git a/packages/caliper-core/lib/config/config-util.js b/packages/caliper-core/lib/common/config/config-util.js
similarity index 100%
rename from packages/caliper-core/lib/config/config-util.js
rename to packages/caliper-core/lib/common/config/config-util.js
diff --git a/packages/caliper-core/lib/config/default.yaml b/packages/caliper-core/lib/common/config/default.yaml
similarity index 100%
rename from packages/caliper-core/lib/config/default.yaml
rename to packages/caliper-core/lib/common/config/default.yaml
diff --git a/packages/caliper-core/lib/blockchain-interface.js b/packages/caliper-core/lib/common/core/blockchain-interface.js
similarity index 100%
rename from packages/caliper-core/lib/blockchain-interface.js
rename to packages/caliper-core/lib/common/core/blockchain-interface.js
diff --git a/packages/caliper-core/lib/blockchain.js b/packages/caliper-core/lib/common/core/blockchain.js
similarity index 98%
rename from packages/caliper-core/lib/blockchain.js
rename to packages/caliper-core/lib/common/core/blockchain.js
index 7f855dd59..cee48fd09 100644
--- a/packages/caliper-core/lib/blockchain.js
+++ b/packages/caliper-core/lib/common/core/blockchain.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Logger = require('./utils/caliper-utils').getLogger('blockchain');
+const Logger = require('../utils/caliper-utils').getLogger('blockchain');
 
 /**
  * BlockChain class, define operations to interact with the blockchain system under test
@@ -38,7 +38,7 @@ class Blockchain {
     }
 
     /**
-    * Initialise test environment, e.g. create a fabric channel for the test
+    * Initialize test environment, e.g. create a fabric channel for the test
     * @async
     */
     async init() {
diff --git a/packages/caliper-core/lib/transaction-status.js b/packages/caliper-core/lib/common/core/transaction-status.js
similarity index 90%
rename from packages/caliper-core/lib/transaction-status.js
rename to packages/caliper-core/lib/common/core/transaction-status.js
index 46ccf9977..12cdf659d 100644
--- a/packages/caliper-core/lib/transaction-status.js
+++ b/packages/caliper-core/lib/common/core/transaction-status.js
@@ -37,7 +37,7 @@ class TxStatus {
     }
 
     /**
-     * Getter of the tx's id
+     * Getter of the tx id
      * @return {string}, id
      */
     GetID() {
@@ -45,7 +45,7 @@ class TxStatus {
     }
 
     /**
-     * Setter of the tx's id
+     * Setter of the tx id
      * @param {string} id, id
      */
     SetID(id) {
@@ -53,7 +53,7 @@ class TxStatus {
     }
 
     /**
-     * Getter of the tx's status
+     * Getter of the tx status
      * @return {string}, status
      */
     GetStatus() {
@@ -61,7 +61,7 @@ class TxStatus {
     }
 
     /**
-     * Check if the tx has been committed succesfully
+     * Check if the tx has been committed successfully
      * @return {boolean} committed or not
      */
     IsCommitted() {
@@ -69,7 +69,7 @@ class TxStatus {
     }
 
     /**
-     * Set the tx's status to 'success'
+     * Set the tx status to 'success'
      * The 'time_final' will also be recorded
      * @param {number} time The epoch time to record for the status change.
      */
@@ -79,7 +79,7 @@ class TxStatus {
     }
 
     /**
-     * Getter of the tx's creating time
+     * Getter of the tx creating time
      * @return {int} create time in ms
      */
     GetTimeCreate() {
@@ -87,7 +87,7 @@ class TxStatus {
     }
 
     /**
-     * Getter of the tx's final time
+     * Getter of the tx final time
      * @return {int} final time in ms
      */
     GetTimeFinal() {
@@ -95,7 +95,7 @@ class TxStatus {
     }
 
     /**
-     * Set the tx's status to 'failed'
+     * Set the tx status to 'failed'
      * The 'time_final' will also be recorded
      */
     SetStatusFail() {
@@ -104,7 +104,7 @@ class TxStatus {
     }
 
     /**
-     * Check if the tx's status is verified
+     * Check if the tx status is verified
      * @return {boolean}, verified or not
      */
     IsVerified() {
@@ -112,7 +112,7 @@ class TxStatus {
     }
 
     /**
-     * Setter of the tx's verification state
+     * Setter of the tx verification state
      * @param {*} isVerified, verified or not
      */
     SetVerification(isVerified) {
@@ -120,7 +120,7 @@ class TxStatus {
     }
 
     /**
-     * Getter of the blockchain sepecified flag
+     * Getter of the blockchain specified flag
      * @return {any}, flag
      */
     GetFlag() {
diff --git a/packages/caliper-core/lib/prometheus/prometheus-push-client.js b/packages/caliper-core/lib/common/prometheus/prometheus-push-client.js
similarity index 100%
rename from packages/caliper-core/lib/prometheus/prometheus-push-client.js
rename to packages/caliper-core/lib/common/prometheus/prometheus-push-client.js
diff --git a/packages/caliper-core/lib/prometheus/prometheus-query-client.js b/packages/caliper-core/lib/common/prometheus/prometheus-query-client.js
similarity index 100%
rename from packages/caliper-core/lib/prometheus/prometheus-query-client.js
rename to packages/caliper-core/lib/common/prometheus/prometheus-query-client.js
diff --git a/packages/caliper-core/lib/prometheus/prometheus-query-helper.js b/packages/caliper-core/lib/common/prometheus/prometheus-query-helper.js
similarity index 100%
rename from packages/caliper-core/lib/prometheus/prometheus-query-helper.js
rename to packages/caliper-core/lib/common/prometheus/prometheus-query-helper.js
diff --git a/packages/caliper-core/lib/utils/benchmark-validator.js b/packages/caliper-core/lib/common/utils/benchmark-validator.js
similarity index 100%
rename from packages/caliper-core/lib/utils/benchmark-validator.js
rename to packages/caliper-core/lib/common/utils/benchmark-validator.js
diff --git a/packages/caliper-core/lib/utils/caliper-utils.js b/packages/caliper-core/lib/common/utils/caliper-utils.js
similarity index 98%
rename from packages/caliper-core/lib/utils/caliper-utils.js
rename to packages/caliper-core/lib/common/utils/caliper-utils.js
index 011879c83..db1580704 100644
--- a/packages/caliper-core/lib/utils/caliper-utils.js
+++ b/packages/caliper-core/lib/common/utils/caliper-utils.js
@@ -78,19 +78,19 @@ class CaliperUtils {
 
     /**
      * parse a yaml file.
-     * @param {String} filenameOrFilepath the yaml file path
+     * @param {String} filenameOrFilePath the yaml file path
      * @return {object} the parsed data.
      */
-    static parseYaml(filenameOrFilepath) {
-        if (!filenameOrFilepath) {
+    static parseYaml(filenameOrFilePath) {
+        if (!filenameOrFilePath) {
             throw new Error('Util.parseYaml: the name or path of a file is undefined');
         }
 
         try{
-            return yaml.safeLoad(fs.readFileSync(filenameOrFilepath),'utf8');
+            return yaml.safeLoad(fs.readFileSync(filenameOrFilePath),'utf8');
         }
         catch(err) {
-            throw new Error(`Failed to parse the ${filenameOrFilepath}: ${(err.message || err)}`);
+            throw new Error(`Failed to parse the ${filenameOrFilePath}: ${(err.message || err)}`);
         }
     }
 
diff --git a/packages/caliper-core/lib/utils/log-formats.js b/packages/caliper-core/lib/common/utils/log-formats.js
similarity index 100%
rename from packages/caliper-core/lib/utils/log-formats.js
rename to packages/caliper-core/lib/common/utils/log-formats.js
diff --git a/packages/caliper-core/lib/utils/logging-util.js b/packages/caliper-core/lib/common/utils/logging-util.js
similarity index 99%
rename from packages/caliper-core/lib/utils/logging-util.js
rename to packages/caliper-core/lib/common/utils/logging-util.js
index 20e7349a2..3ede7d74a 100644
--- a/packages/caliper-core/lib/utils/logging-util.js
+++ b/packages/caliper-core/lib/common/utils/logging-util.js
@@ -108,7 +108,7 @@ function _processFormatOptions() {
     //    so the user can change them from the command line or from evn vars
     // 2) The sub-properties of the formats are also queried directly for the same reason
     // 3) The formats are applied in the following order: timestamp, label, json,
-    //    if not json, then padding, align, attributeformat, colorize
+    //    if not json, then padding, align, AttributeFormat, colorize
 
 
     let formatKey = conf.keys.Logging.Formats;
diff --git a/packages/caliper-core/lib/utils/version.js b/packages/caliper-core/lib/common/utils/version.js
similarity index 100%
rename from packages/caliper-core/lib/utils/version.js
rename to packages/caliper-core/lib/common/utils/version.js
diff --git a/packages/caliper-core/lib/caliper-flow.js b/packages/caliper-core/lib/master/caliper-flow.js
similarity index 95%
rename from packages/caliper-core/lib/caliper-flow.js
rename to packages/caliper-core/lib/master/caliper-flow.js
index 296bc1bcb..a4681abbb 100644
--- a/packages/caliper-core/lib/caliper-flow.js
+++ b/packages/caliper-core/lib/master/caliper-flow.js
@@ -14,14 +14,14 @@
 
 'use strict';
 
-const Blockchain = require('./blockchain');
-const CaliperUtils = require('./utils/caliper-utils');
-const ClientOrchestrator  = require('./client/client-orchestrator');
+const Blockchain = require('../common/core/blockchain');
+const CaliperUtils = require('../common/utils/caliper-utils');
+const ClientOrchestrator  = require('../worker/client/client-orchestrator');
 const MonitorOrchestrator = require('./monitor/monitor-orchestrator');
 const Report = require('./report/report');
 const DefaultTest = require('./test-runners/default-test');
 const TestObserver = require('./test-observers/test-observer');
-const BenchValidator = require('./utils/benchmark-validator');
+const BenchValidator = require('../common/utils/benchmark-validator');
 
 const logger = CaliperUtils.getLogger('caliper-flow');
 
diff --git a/packages/caliper-core/lib/monitor/monitor-docker.js b/packages/caliper-core/lib/master/monitor/monitor-docker.js
similarity index 99%
rename from packages/caliper-core/lib/monitor/monitor-docker.js
rename to packages/caliper-core/lib/master/monitor/monitor-docker.js
index 817310163..702778158 100644
--- a/packages/caliper-core/lib/monitor/monitor-docker.js
+++ b/packages/caliper-core/lib/master/monitor/monitor-docker.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const Util = require('../utils/caliper-utils');
+const Util = require('../../common/utils/caliper-utils');
 const Logger = Util.getLogger('monitor-docker');
 const MonitorInterface = require('./monitor-interface');
 const MonitorUtilities = require('./monitor-utilities');
diff --git a/packages/caliper-core/lib/monitor/monitor-interface.js b/packages/caliper-core/lib/master/monitor/monitor-interface.js
similarity index 100%
rename from packages/caliper-core/lib/monitor/monitor-interface.js
rename to packages/caliper-core/lib/master/monitor/monitor-interface.js
diff --git a/packages/caliper-core/lib/monitor/monitor-orchestrator.js b/packages/caliper-core/lib/master/monitor/monitor-orchestrator.js
similarity index 98%
rename from packages/caliper-core/lib/monitor/monitor-orchestrator.js
rename to packages/caliper-core/lib/master/monitor/monitor-orchestrator.js
index 59dbae2ef..ca60cb1e4 100644
--- a/packages/caliper-core/lib/monitor/monitor-orchestrator.js
+++ b/packages/caliper-core/lib/master/monitor/monitor-orchestrator.js
@@ -18,7 +18,7 @@
 const DockerMonitor = require('./monitor-docker.js');
 const ProcessMonitor = require('./monitor-process.js');
 const PrometheusMonitor = require('./monitor-prometheus.js');
-const Util  = require('../utils/caliper-utils');
+const Util  = require('../../common/utils/caliper-utils');
 const logger= Util.getLogger('monitor.js');
 
 const NONE = 'none';
diff --git a/packages/caliper-core/lib/monitor/monitor-process.js b/packages/caliper-core/lib/master/monitor/monitor-process.js
similarity index 99%
rename from packages/caliper-core/lib/monitor/monitor-process.js
rename to packages/caliper-core/lib/master/monitor/monitor-process.js
index 75e5e3595..a98fbae98 100644
--- a/packages/caliper-core/lib/monitor/monitor-process.js
+++ b/packages/caliper-core/lib/master/monitor/monitor-process.js
@@ -16,7 +16,7 @@
 
 const MonitorInterface = require('./monitor-interface');
 const MonitorUtilities = require('./monitor-utilities');
-const Util = require('../utils/caliper-utils');
+const Util = require('../../common/utils/caliper-utils');
 const Logger = Util.getLogger('monitor-process');
 
 const ps = require('ps-node');
diff --git a/packages/caliper-core/lib/monitor/monitor-prometheus.js b/packages/caliper-core/lib/master/monitor/monitor-prometheus.js
similarity index 94%
rename from packages/caliper-core/lib/monitor/monitor-prometheus.js
rename to packages/caliper-core/lib/master/monitor/monitor-prometheus.js
index c57c9f2a5..421b315b2 100644
--- a/packages/caliper-core/lib/monitor/monitor-prometheus.js
+++ b/packages/caliper-core/lib/master/monitor/monitor-prometheus.js
@@ -14,13 +14,13 @@
 
 'use strict';
 
-const Util = require('../utils/caliper-utils.js');
+const Util = require('../../common/utils/caliper-utils.js');
 
 const Logger = Util.getLogger('monitor-prometheus.js');
 const MonitorInterface = require('./monitor-interface');
-const PrometheusPushClient = require('../prometheus/prometheus-push-client');
-const PrometheusQueryClient = require('../prometheus/prometheus-query-client');
-const PrometheusQueryHelper = require('../prometheus/prometheus-query-helper');
+const PrometheusPushClient = require('../../common/prometheus/prometheus-push-client');
+const PrometheusQueryClient = require('../../common/prometheus/prometheus-query-client');
+const PrometheusQueryHelper = require('../../common/prometheus/prometheus-query-helper');
 
 /**
  * Prometheus monitor implementation
diff --git a/packages/caliper-core/lib/monitor/monitor-utilities.js b/packages/caliper-core/lib/master/monitor/monitor-utilities.js
similarity index 100%
rename from packages/caliper-core/lib/monitor/monitor-utilities.js
rename to packages/caliper-core/lib/master/monitor/monitor-utilities.js
diff --git a/packages/caliper-core/lib/report/report-builder.js b/packages/caliper-core/lib/master/report/report-builder.js
similarity index 98%
rename from packages/caliper-core/lib/report/report-builder.js
rename to packages/caliper-core/lib/master/report/report-builder.js
index 89c27585e..1396bfdc5 100644
--- a/packages/caliper-core/lib/report/report-builder.js
+++ b/packages/caliper-core/lib/master/report/report-builder.js
@@ -15,9 +15,9 @@
 
 'use strict';
 
-const Config = require('../config/config-util');
-const Utils = require('../utils/caliper-utils');
-const Logger = Utils.getLogger('caliper-flow');
+const Config = require('../../common/config/config-util');
+const Utils = require('../../common/utils/caliper-utils');
+const Logger = Utils.getLogger('report-builder');
 const fs = require('fs');
 const Mustache = require('mustache');
 const path = require('path');
diff --git a/packages/caliper-core/lib/report/report.js b/packages/caliper-core/lib/master/report/report.js
similarity index 98%
rename from packages/caliper-core/lib/report/report.js
rename to packages/caliper-core/lib/master/report/report.js
index a5f2cdcea..e068bbd86 100644
--- a/packages/caliper-core/lib/report/report.js
+++ b/packages/caliper-core/lib/master/report/report.js
@@ -15,9 +15,9 @@
 'use strict';
 
 const ReportBuilder = require('./report-builder');
-const PrometheusQueryHelper = require('../prometheus/prometheus-query-helper');
-const Blockchain = require('../blockchain');
-const CaliperUtils = require('../utils/caliper-utils');
+const PrometheusQueryHelper = require('../../common/prometheus/prometheus-query-helper');
+const Blockchain = require('../../common/core/blockchain');
+const CaliperUtils = require('../../common/utils/caliper-utils');
 const Logger = CaliperUtils.getLogger('report-builder');
 
 const table = require('table');
diff --git a/packages/caliper-core/lib/report/template/report.html b/packages/caliper-core/lib/master/report/template/report.html
old mode 100644
new mode 100755
similarity index 99%
rename from packages/caliper-core/lib/report/template/report.html
rename to packages/caliper-core/lib/master/report/template/report.html
index 93746bc07..5d499d5c3
--- a/packages/caliper-core/lib/report/template/report.html
+++ b/packages/caliper-core/lib/master/report/template/report.html
@@ -1,7 +1,7 @@
 <!doctype html>
 <html>
 <head>
-    <title>Caliper Report</title>
+    <title>Hyperledger Caliper Report</title>
     <meta charset="UTF-8"/>
     <style type="text/css">
         .left-column {
diff --git a/packages/caliper-core/lib/test-observers/local-observer.js b/packages/caliper-core/lib/master/test-observers/local-observer.js
similarity index 99%
rename from packages/caliper-core/lib/test-observers/local-observer.js
rename to packages/caliper-core/lib/master/test-observers/local-observer.js
index c778c73d7..c905c26f4 100644
--- a/packages/caliper-core/lib/test-observers/local-observer.js
+++ b/packages/caliper-core/lib/master/test-observers/local-observer.js
@@ -16,7 +16,7 @@
 'use strict';
 
 const TestObserverInterface = require('./observer-interface');
-const Utils = require('../utils/caliper-utils');
+const Utils = require('../../common/utils/caliper-utils');
 const Logger = Utils.getLogger('local-observer');
 
 /**
diff --git a/packages/caliper-core/lib/test-observers/null-observer.js b/packages/caliper-core/lib/master/test-observers/null-observer.js
similarity index 97%
rename from packages/caliper-core/lib/test-observers/null-observer.js
rename to packages/caliper-core/lib/master/test-observers/null-observer.js
index 3e03a0cd9..5c79efdb6 100644
--- a/packages/caliper-core/lib/test-observers/null-observer.js
+++ b/packages/caliper-core/lib/master/test-observers/null-observer.js
@@ -16,7 +16,7 @@
 'use strict';
 
 const TestObserverInterface = require('./observer-interface');
-const Utils = require('../utils/caliper-utils');
+const Utils = require('../../common/utils/caliper-utils');
 const Logger = Utils.getLogger('null-observer');
 
 /**
diff --git a/packages/caliper-core/lib/test-observers/observer-interface.js b/packages/caliper-core/lib/master/test-observers/observer-interface.js
similarity index 97%
rename from packages/caliper-core/lib/test-observers/observer-interface.js
rename to packages/caliper-core/lib/master/test-observers/observer-interface.js
index f66d90600..bffdf516a 100644
--- a/packages/caliper-core/lib/test-observers/observer-interface.js
+++ b/packages/caliper-core/lib/master/test-observers/observer-interface.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Util = require('../utils/caliper-utils');
+const Util = require('../../common/utils/caliper-utils');
 
 /**
  * Interface of test observer. Test observer implementations must follow a naming convention that is <type>-observer.js so
diff --git a/packages/caliper-core/lib/test-observers/prometheus-observer.js b/packages/caliper-core/lib/master/test-observers/prometheus-observer.js
similarity index 95%
rename from packages/caliper-core/lib/test-observers/prometheus-observer.js
rename to packages/caliper-core/lib/master/test-observers/prometheus-observer.js
index 33f12f091..13ec00e2e 100644
--- a/packages/caliper-core/lib/test-observers/prometheus-observer.js
+++ b/packages/caliper-core/lib/master/test-observers/prometheus-observer.js
@@ -16,9 +16,9 @@
 'use strict';
 
 const TestObserverInterface = require('./observer-interface');
-const PrometheusQueryClient = require('../prometheus/prometheus-query-client');
-const PrometheusQueryHelper = require('../prometheus/prometheus-query-helper');
-const Utils = require('../utils/caliper-utils');
+const PrometheusQueryClient = require('../../common/prometheus/prometheus-query-client');
+const PrometheusQueryHelper = require('../../common/prometheus/prometheus-query-helper');
+const Utils = require('../../common/utils/caliper-utils');
 const Logger = Utils.getLogger('prometheus-observer');
 
 /**
diff --git a/packages/caliper-core/lib/test-observers/test-observer.js b/packages/caliper-core/lib/master/test-observers/test-observer.js
similarity index 97%
rename from packages/caliper-core/lib/test-observers/test-observer.js
rename to packages/caliper-core/lib/master/test-observers/test-observer.js
index 0903c96cf..0d6be3048 100644
--- a/packages/caliper-core/lib/test-observers/test-observer.js
+++ b/packages/caliper-core/lib/master/test-observers/test-observer.js
@@ -13,7 +13,7 @@
 */
 'use strict';
 
-const CaliperUtils = require('../utils/caliper-utils');
+const CaliperUtils = require('../../common/utils/caliper-utils');
 const Logger = CaliperUtils.getLogger('testObserver.js');
 
 const builtInObservers = new Map([
diff --git a/packages/caliper-core/lib/test-runners/default-test.js b/packages/caliper-core/lib/master/test-runners/default-test.js
similarity index 98%
rename from packages/caliper-core/lib/test-runners/default-test.js
rename to packages/caliper-core/lib/master/test-runners/default-test.js
index 31da79ee2..f899a2a11 100644
--- a/packages/caliper-core/lib/test-runners/default-test.js
+++ b/packages/caliper-core/lib/master/test-runners/default-test.js
@@ -15,7 +15,7 @@
 
 'use strict';
 
-const CaliperUtils = require('../utils/caliper-utils');
+const CaliperUtils = require('../../common/utils/caliper-utils');
 const logger = CaliperUtils.getLogger('defaultTest');
 
 const path = require('path');
diff --git a/packages/caliper-core/lib/client/caliper-local-client.js b/packages/caliper-core/lib/worker/client/caliper-local-client.js
similarity index 98%
rename from packages/caliper-core/lib/client/caliper-local-client.js
rename to packages/caliper-core/lib/worker/client/caliper-local-client.js
index 186bc98aa..29d80def5 100644
--- a/packages/caliper-core/lib/client/caliper-local-client.js
+++ b/packages/caliper-core/lib/worker/client/caliper-local-client.js
@@ -14,13 +14,13 @@
 
 'use strict';
 
-const Config = require('../config/config-util.js');
-const CaliperUtils = require('../utils/caliper-utils.js');
-const Logger = CaliperUtils.getLogger('local-client.js');
-const bc   = require('../blockchain.js');
+const Config = require('../../common/config/config-util.js');
+const CaliperUtils = require('../../common/utils/caliper-utils.js');
+const bc   = require('../../common/core/blockchain.js');
 const RateControl = require('../rate-control/rateControl.js');
-const PrometheusClient = require('../prometheus/prometheus-push-client');
+const PrometheusClient = require('../../common/prometheus/prometheus-push-client');
 
+const Logger = CaliperUtils.getLogger('local-client.js');
 /**
  * Class for Client Interaction
  */
diff --git a/packages/caliper-core/lib/client/client-orchestrator.js b/packages/caliper-core/lib/worker/client/client-orchestrator.js
similarity index 99%
rename from packages/caliper-core/lib/client/client-orchestrator.js
rename to packages/caliper-core/lib/worker/client/client-orchestrator.js
index c70291b0c..add074f68 100644
--- a/packages/caliper-core/lib/client/client-orchestrator.js
+++ b/packages/caliper-core/lib/worker/client/client-orchestrator.js
@@ -15,7 +15,8 @@
 
 'use strict';
 
-const util = require('../utils/caliper-utils');
+const util = require('../../common/utils/caliper-utils');
+
 const logger = util.getLogger('client.js');
 
 /**
@@ -56,7 +57,7 @@ class ClientOrchestrator {
     *              trim:   trim options
     *              args:   user defined arguments,
     *              cb  :   path of the callback js file,
-    *              config: path of the blockchain config file   // TODO: how to deal with the local config file when transfer it to a remote client (via zookeeper), as well as any local materials like cyrpto keys??
+    *              config: path of the blockchain config file   // TODO: how to deal with the local config file when transfer it to a remote client (via zookeeper), as well as any local materials like crypto keys??
     *            };
     * @param {JSON} test test specification
     * @param {Array} clientArgs each element of the array contains arguments that should be passed to corresponding test client
diff --git a/packages/caliper-core/lib/rate-control/compositeRate.js b/packages/caliper-core/lib/worker/rate-control/compositeRate.js
similarity index 99%
rename from packages/caliper-core/lib/rate-control/compositeRate.js
rename to packages/caliper-core/lib/worker/rate-control/compositeRate.js
index e8f246af7..a1ce22dd4 100644
--- a/packages/caliper-core/lib/rate-control/compositeRate.js
+++ b/packages/caliper-core/lib/worker/rate-control/compositeRate.js
@@ -15,8 +15,7 @@
 'use strict';
 const RateInterface = require('./rateInterface.js');
 const RateControl = require('./rateControl.js');
-const CaliperUtils = require('../utils/caliper-utils');
-const logger = CaliperUtils.getLogger('compositeRate.js');
+const logger = require('../../common/utils/caliper-utils').getLogger('compositeRate.js');
 
 /**
  * Encapsulates a controller and its scheduling information.
diff --git a/packages/caliper-core/lib/rate-control/fixedBacklog.js b/packages/caliper-core/lib/worker/rate-control/fixedBacklog.js
similarity index 96%
rename from packages/caliper-core/lib/rate-control/fixedBacklog.js
rename to packages/caliper-core/lib/worker/rate-control/fixedBacklog.js
index 338cd0612..157adcb1d 100644
--- a/packages/caliper-core/lib/rate-control/fixedBacklog.js
+++ b/packages/caliper-core/lib/worker/rate-control/fixedBacklog.js
@@ -15,8 +15,8 @@
 'use strict';
 
 const RateInterface = require('./rateInterface.js');
-const Sleep = require('../utils/caliper-utils').sleep;
-const Logger = require('../utils/caliper-utils').getLogger('fixedBacklog.js');
+const Sleep = require('../../common/utils/caliper-utils').sleep;
+const Logger = require('../../common/utils/caliper-utils').getLogger('fixedBacklog.js');
 
 /**
  * Rate controller for driving at a target loading (backlog transactions). This controller will aim to maintain a defined backlog
diff --git a/packages/caliper-core/lib/rate-control/fixedFeedbackRate.js b/packages/caliper-core/lib/worker/rate-control/fixedFeedbackRate.js
similarity index 98%
rename from packages/caliper-core/lib/rate-control/fixedFeedbackRate.js
rename to packages/caliper-core/lib/worker/rate-control/fixedFeedbackRate.js
index 9bd95eb91..4ce4bcd79 100644
--- a/packages/caliper-core/lib/rate-control/fixedFeedbackRate.js
+++ b/packages/caliper-core/lib/worker/rate-control/fixedFeedbackRate.js
@@ -15,7 +15,7 @@
 'use strict';
 
 const RateInterface = require('./rateInterface.js');
-const util = require('../utils/caliper-utils');
+const util = require('../../common/utils/caliper-utils');
 
 /**
  * This controller will send transactions at a specified fixed interval,
diff --git a/packages/caliper-core/lib/rate-control/fixedRate.js b/packages/caliper-core/lib/worker/rate-control/fixedRate.js
similarity index 98%
rename from packages/caliper-core/lib/rate-control/fixedRate.js
rename to packages/caliper-core/lib/worker/rate-control/fixedRate.js
index 988eb58d7..ec169c3c0 100644
--- a/packages/caliper-core/lib/rate-control/fixedRate.js
+++ b/packages/caliper-core/lib/worker/rate-control/fixedRate.js
@@ -15,7 +15,7 @@
 'use strict';
 
 let RateInterface = require('./rateInterface.js');
-let Sleep = require('../utils/caliper-utils').sleep;
+let Sleep = require('../../common/utils/caliper-utils').sleep;
 
 /**
  * This controller will send transactions at a specified fixed interval.
diff --git a/packages/caliper-core/lib/rate-control/linearRate.js b/packages/caliper-core/lib/worker/rate-control/linearRate.js
similarity index 98%
rename from packages/caliper-core/lib/rate-control/linearRate.js
rename to packages/caliper-core/lib/worker/rate-control/linearRate.js
index 0ff8e54a7..f309fe3e4 100644
--- a/packages/caliper-core/lib/rate-control/linearRate.js
+++ b/packages/caliper-core/lib/worker/rate-control/linearRate.js
@@ -15,7 +15,7 @@
 'use strict';
 
 const RateInterface = require('./rateInterface.js');
-const util = require('../utils/caliper-utils');
+const util = require('../../common/utils/caliper-utils');
 
 /**
  * Rate controller for generating a linearly changing workload.
diff --git a/packages/caliper-core/lib/rate-control/noRate.js b/packages/caliper-core/lib/worker/rate-control/noRate.js
similarity index 98%
rename from packages/caliper-core/lib/rate-control/noRate.js
rename to packages/caliper-core/lib/worker/rate-control/noRate.js
index d8599ebb6..6f4720b0d 100644
--- a/packages/caliper-core/lib/rate-control/noRate.js
+++ b/packages/caliper-core/lib/worker/rate-control/noRate.js
@@ -15,7 +15,7 @@
 'use strict';
 
 const RateInterface = require('./rateInterface.js');
-const Util = require('../utils/caliper-utils');
+const Util = require('../../common/utils/caliper-utils');
 
 /**
  * Rate controller for pausing load generation for a given time.
diff --git a/packages/caliper-core/lib/rate-control/rateControl.js b/packages/caliper-core/lib/worker/rate-control/rateControl.js
similarity index 98%
rename from packages/caliper-core/lib/rate-control/rateControl.js
rename to packages/caliper-core/lib/worker/rate-control/rateControl.js
index 06278e842..58c23e0f9 100644
--- a/packages/caliper-core/lib/rate-control/rateControl.js
+++ b/packages/caliper-core/lib/worker/rate-control/rateControl.js
@@ -13,7 +13,7 @@
 */
 'use strict';
 
-const CaliperUtils = require('../utils/caliper-utils');
+const CaliperUtils = require('../../common/utils/caliper-utils');
 const logger = CaliperUtils.getLogger('rateControl.js');
 
 const builtInControllers = new Map([
diff --git a/packages/caliper-core/lib/rate-control/rateInterface.js b/packages/caliper-core/lib/worker/rate-control/rateInterface.js
similarity index 100%
rename from packages/caliper-core/lib/rate-control/rateInterface.js
rename to packages/caliper-core/lib/worker/rate-control/rateInterface.js
diff --git a/packages/caliper-core/lib/rate-control/recordRate.js b/packages/caliper-core/lib/worker/rate-control/recordRate.js
similarity index 99%
rename from packages/caliper-core/lib/rate-control/recordRate.js
rename to packages/caliper-core/lib/worker/rate-control/recordRate.js
index 2f26551d9..825790fa5 100644
--- a/packages/caliper-core/lib/rate-control/recordRate.js
+++ b/packages/caliper-core/lib/worker/rate-control/recordRate.js
@@ -17,7 +17,7 @@
 const RateInterface = require('./rateInterface.js');
 const RateControl = require('./rateControl');
 const fs = require('fs');
-const util = require('../utils/caliper-utils');
+const util = require('../../common/utils/caliper-utils');
 const logger = util.getLogger('recordRate.js');
 
 const TEXT_FORMAT = 'TEXT';
diff --git a/packages/caliper-core/lib/rate-control/replayRate.js b/packages/caliper-core/lib/worker/rate-control/replayRate.js
similarity index 99%
rename from packages/caliper-core/lib/rate-control/replayRate.js
rename to packages/caliper-core/lib/worker/rate-control/replayRate.js
index 6a871393d..e6871a69d 100644
--- a/packages/caliper-core/lib/rate-control/replayRate.js
+++ b/packages/caliper-core/lib/worker/rate-control/replayRate.js
@@ -16,7 +16,7 @@
 
 const RateInterface = require('./rateInterface.js');
 const fs = require('fs');
-const util = require('../utils/caliper-utils');
+const util = require('../../common/utils/caliper-utils');
 const logger = util.getLogger('replayRate.js');
 
 const TEXT_FORMAT = 'TEXT';
diff --git a/packages/caliper-core/test/prometheus/prometheus-query-helper.js b/packages/caliper-core/test/common/prometheus/prometheus-query-helper.js
similarity index 99%
rename from packages/caliper-core/test/prometheus/prometheus-query-helper.js
rename to packages/caliper-core/test/common/prometheus/prometheus-query-helper.js
index 0b7cdddb7..daa4b99a0 100644
--- a/packages/caliper-core/test/prometheus/prometheus-query-helper.js
+++ b/packages/caliper-core/test/common/prometheus/prometheus-query-helper.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const PrometheusQueryHelper = require('../../lib/prometheus/prometheus-query-helper');
+const PrometheusQueryHelper = require('../../../lib/common/prometheus/prometheus-query-helper');
 
 const chai = require('chai');
 chai.should();
diff --git a/packages/caliper-core/test/monitor/monitor-prometheus.js b/packages/caliper-core/test/master/monitor/monitor-prometheus.js
similarity index 98%
rename from packages/caliper-core/test/monitor/monitor-prometheus.js
rename to packages/caliper-core/test/master/monitor/monitor-prometheus.js
index 9335d0cba..0c2390117 100644
--- a/packages/caliper-core/test/monitor/monitor-prometheus.js
+++ b/packages/caliper-core/test/master/monitor/monitor-prometheus.js
@@ -15,7 +15,7 @@
 'use strict';
 
 const rewire = require('rewire');
-const PrometheusMonitorRewire = rewire('../../lib/monitor/monitor-prometheus');
+const PrometheusMonitorRewire = rewire('../../../lib/master/monitor/monitor-prometheus');
 
 const chai = require('chai');
 const should = chai.should();
diff --git a/packages/caliper-core/test/report/report.js b/packages/caliper-core/test/master/report/report.js
similarity index 99%
rename from packages/caliper-core/test/report/report.js
rename to packages/caliper-core/test/master/report/report.js
index 22a6ab794..f19cdfe11 100644
--- a/packages/caliper-core/test/report/report.js
+++ b/packages/caliper-core/test/master/report/report.js
@@ -14,7 +14,7 @@
 
 'use strict';
 
-const Report = require('../../lib/report/report');
+const Report = require('../../../lib/master/report/report');
 
 const chai = require('chai');
 chai.should();
diff --git a/packages/caliper-core/test/client/client-orchestrator.js b/packages/caliper-core/test/worker/client/client-orchestrator.js
similarity index 98%
rename from packages/caliper-core/test/client/client-orchestrator.js
rename to packages/caliper-core/test/worker/client/client-orchestrator.js
index cbcaf2fa3..7866851d7 100644
--- a/packages/caliper-core/test/client/client-orchestrator.js
+++ b/packages/caliper-core/test/worker/client/client-orchestrator.js
@@ -15,7 +15,7 @@
 'use strict';
 
 const rewire = require('rewire');
-const ClientOrchestratorRewire = rewire('../../lib/client/client-orchestrator');
+const ClientOrchestratorRewire = rewire('../../../lib/worker/client/client-orchestrator');
 
 const chai = require('chai');
 chai.should();
diff --git a/packages/caliper-core/test/rate-control/fixedBacklog.js b/packages/caliper-core/test/worker/rate-control/fixedBacklog.js
similarity index 95%
rename from packages/caliper-core/test/rate-control/fixedBacklog.js
rename to packages/caliper-core/test/worker/rate-control/fixedBacklog.js
index 47e400e26..19d677d36 100644
--- a/packages/caliper-core/test/rate-control/fixedBacklog.js
+++ b/packages/caliper-core/test/worker/rate-control/fixedBacklog.js
@@ -15,7 +15,7 @@
 'use strict';
 
 const rewire = require('rewire');
-const FixedBacklog = rewire('../../lib/rate-control/fixedBacklog');
+const FixedBacklog = rewire('../../../lib/worker/rate-control/fixedBacklog');
 
 const chai = require('chai');
 chai.should();
@@ -60,7 +60,7 @@ describe ('fixedBacklog controller implementation', () => {
     describe ('#applyRateControl', () => {
 
         let sleepStub;
-        
+
         beforeEach(() => {
             sleepStub = sinon.stub();
             FixedBacklog.__set__('Sleep', sleepStub);
@@ -68,19 +68,19 @@ describe ('fixedBacklog controller implementation', () => {
             controller = new FixedBacklog.createRateController(opts);
             controller.init();
         });
-        
+
         it ('should sleep if resultStats.length < 2', () => {
             controller.applyRateControl(null, 1, [], []);
             sinon.assert.calledOnce(sleepStub);
             sinon.assert.calledWith(sleepStub, 40);
         });
-        
+
         it ('should sleep if no successful results are available', () => {
             controller.applyRateControl(null, 1, [], [{}]);
             sinon.assert.calledOnce(sleepStub);
             sinon.assert.calledWith(sleepStub, 40);
         });
-        
+
         it ('should sleep if no delay results are available', () => {
             controller.applyRateControl(null, 1, [], [{}]);
             sinon.assert.calledOnce(sleepStub);
@@ -139,7 +139,7 @@ describe ('fixedBacklog controller implementation', () => {
             resultStats.push(item);
 
             controller.applyRateControl(null, idx, currentResults, resultStats);
-            
+
             const completeTransactions = resultStats[0].length - currentResults.length;
             const unfinshed = idx - completeTransactions;
 
@@ -151,12 +151,12 @@ describe ('fixedBacklog controller implementation', () => {
         });
 
         it('should log the backlog error as a debug message', () => {
-            
+
             const FakeLogger = {
-				debug : () => {},
-				error: () => {}
-			};
-            
+                debug : () => {},
+                error: () => {}
+            };
+
             let debugStub = sinon.stub(FakeLogger, 'debug');
             FixedBacklog.__set__('Logger', FakeLogger);
 
@@ -174,13 +174,13 @@ describe ('fixedBacklog controller implementation', () => {
             resultStats.push(item);
 
             controller.applyRateControl(null, idx, currentResults, resultStats);
-            
+
             const completeTransactions = resultStats[0].length - currentResults.length;
             const unfinshed = idx - completeTransactions;
 
             const error = unfinshed - 30;
-            const message = "Backlog error: " + error;
- 
+            const message = 'Backlog error: ' + error;
+
             sinon.assert.calledOnce(debugStub);
             sinon.assert.calledWith(debugStub, message);
 
diff --git a/packages/caliper-core/test/rate-control/fixedRate.js b/packages/caliper-core/test/worker/rate-control/fixedRate.js
similarity index 97%
rename from packages/caliper-core/test/rate-control/fixedRate.js
rename to packages/caliper-core/test/worker/rate-control/fixedRate.js
index c12cc7520..a9a09b45e 100644
--- a/packages/caliper-core/test/rate-control/fixedRate.js
+++ b/packages/caliper-core/test/worker/rate-control/fixedRate.js
@@ -15,7 +15,7 @@
 'use strict';
 
 const rewire = require('rewire');
-const FixedRate = rewire('../../lib/rate-control/fixedRate');
+const FixedRate = rewire('../../../lib/worker/rate-control/fixedRate');
 
 const chai = require('chai');
 chai.should();
diff --git a/packages/caliper-core/test/rate-control/noRate.js b/packages/caliper-core/test/worker/rate-control/noRate.js
similarity index 91%
rename from packages/caliper-core/test/rate-control/noRate.js
rename to packages/caliper-core/test/worker/rate-control/noRate.js
index f657b779a..178092346 100644
--- a/packages/caliper-core/test/rate-control/noRate.js
+++ b/packages/caliper-core/test/worker/rate-control/noRate.js
@@ -15,17 +15,18 @@
 'use strict';
 
 const rewire = require('rewire');
-const NoRate = rewire('../../lib/rate-control/noRate');
+const NoRate = rewire('../../../lib/worker/rate-control/noRate');
 
 const chai = require('chai');
 chai.should();
 const sinon = require('sinon');
+const assert = require('assert');
 
 describe ('noRate controller implementation', () => {
     let controller;
 
     describe('#init', () => {
-        it ('should throw an error if a value for the number of transactions is set', async () => {       
+        it ('should throw an error if a value for the number of transactions is set', async () => {
             try {
                 controller = new NoRate.createRateController({});
                 const msg = {numb: 5};
@@ -36,7 +37,7 @@ describe ('noRate controller implementation', () => {
                     throw error;
                 }
                 error.message.should.equal('The no-rate controller can only be applied for duration-based rounds');
-            }         
+            }
         });
 
         it ('should set the sleep time based on the length of the round in seconds', () => {
@@ -57,7 +58,7 @@ describe ('noRate controller implementation', () => {
 
             controller = new NoRate.createRateController({});
 
-            controller.sleepTime = msg.txDuration * 1000
+            controller.sleepTime = msg.txDuration * 1000;
             let sleepTime = controller.sleepTime;
 
             controller.applyRateControl(null, null, null, null);
diff --git a/packages/caliper-fisco-bcos/package.json b/packages/caliper-fisco-bcos/package.json
index 1c22e69d8..cb9c58049 100644
--- a/packages/caliper-fisco-bcos/package.json
+++ b/packages/caliper-fisco-bcos/package.json
@@ -29,7 +29,7 @@
         "ora": "^1.2.0",
         "uuid": "^3.3.2",
         "tls": "^0.0.1",
-        "chalk": "^1.1.3",
+        "chalk": "1.1.3",
         "request-promise": "^4.2.1"
     },
     "devDependencies": {