diff --git a/bin/TODO b/client/bin/TODO
similarity index 100%
rename from bin/TODO
rename to client/bin/TODO
diff --git a/bin/autotest b/client/bin/autotest
similarity index 100%
rename from bin/autotest
rename to client/bin/autotest
diff --git a/bin/autotest.py b/client/bin/autotest.py
similarity index 100%
rename from bin/autotest.py
rename to client/bin/autotest.py
diff --git a/bin/autotest_utils.py b/client/bin/autotest_utils.py
similarity index 100%
rename from bin/autotest_utils.py
rename to client/bin/autotest_utils.py
diff --git a/bin/barrier.py b/client/bin/barrier.py
similarity index 100%
rename from bin/barrier.py
rename to client/bin/barrier.py
diff --git a/bin/boottool.py b/client/bin/boottool.py
similarity index 100%
rename from bin/boottool.py
rename to client/bin/boottool.py
diff --git a/bin/config.py b/client/bin/config.py
similarity index 100%
rename from bin/config.py
rename to client/bin/config.py
diff --git a/bin/error.py b/client/bin/error.py
similarity index 100%
rename from bin/error.py
rename to client/bin/error.py
diff --git a/bin/fd_stack.py b/client/bin/fd_stack.py
similarity index 100%
rename from bin/fd_stack.py
rename to client/bin/fd_stack.py
diff --git a/bin/filesystem.py b/client/bin/filesystem.py
similarity index 100%
rename from bin/filesystem.py
rename to client/bin/filesystem.py
diff --git a/bin/grub.py b/client/bin/grub.py
similarity index 100%
rename from bin/grub.py
rename to client/bin/grub.py
diff --git a/bin/harness.py b/client/bin/harness.py
similarity index 100%
rename from bin/harness.py
rename to client/bin/harness.py
diff --git a/bin/harness_ABAT.py b/client/bin/harness_ABAT.py
similarity index 100%
rename from bin/harness_ABAT.py
rename to client/bin/harness_ABAT.py
diff --git a/bin/job.py b/client/bin/job.py
similarity index 100%
rename from bin/job.py
rename to client/bin/job.py
diff --git a/bin/kernel.py b/client/bin/kernel.py
similarity index 100%
rename from bin/kernel.py
rename to client/bin/kernel.py
diff --git a/bin/kernel_config.py b/client/bin/kernel_config.py
similarity index 100%
rename from bin/kernel_config.py
rename to client/bin/kernel_config.py
diff --git a/bin/os_dep.py b/client/bin/os_dep.py
similarity index 100%
rename from bin/os_dep.py
rename to client/bin/os_dep.py
diff --git a/bin/parallel.py b/client/bin/parallel.py
similarity index 100%
rename from bin/parallel.py
rename to client/bin/parallel.py
diff --git a/bin/profiler.py b/client/bin/profiler.py
similarity index 100%
rename from bin/profiler.py
rename to client/bin/profiler.py
diff --git a/bin/profilers.py b/client/bin/profilers.py
similarity index 100%
rename from bin/profilers.py
rename to client/bin/profilers.py
diff --git a/bin/self-test/README b/client/bin/self-test/README
similarity index 100%
rename from bin/self-test/README
rename to client/bin/self-test/README
diff --git a/bin/self-test/extract_tarball_to_dir b/client/bin/self-test/extract_tarball_to_dir
similarity index 100%
rename from bin/self-test/extract_tarball_to_dir
rename to client/bin/self-test/extract_tarball_to_dir
diff --git a/bin/self-test/test b/client/bin/self-test/test
similarity index 100%
rename from bin/self-test/test
rename to client/bin/self-test/test
diff --git a/bin/self-test/test_logfile.stderr b/client/bin/self-test/test_logfile.stderr
similarity index 100%
rename from bin/self-test/test_logfile.stderr
rename to client/bin/self-test/test_logfile.stderr
diff --git a/bin/self-test/test_logfile.stdout b/client/bin/self-test/test_logfile.stdout
similarity index 100%
rename from bin/self-test/test_logfile.stdout
rename to client/bin/self-test/test_logfile.stdout
diff --git a/bin/self-test/test_redirect b/client/bin/self-test/test_redirect
similarity index 100%
rename from bin/self-test/test_redirect
rename to client/bin/self-test/test_redirect
diff --git a/bin/self-test/tests/010-basic-output b/client/bin/self-test/tests/010-basic-output
similarity index 100%
rename from bin/self-test/tests/010-basic-output
rename to client/bin/self-test/tests/010-basic-output
diff --git a/bin/self-test/tests/010-basic-output-out b/client/bin/self-test/tests/010-basic-output-out
similarity index 100%
rename from bin/self-test/tests/010-basic-output-out
rename to client/bin/self-test/tests/010-basic-output-out
diff --git a/bin/self-test/tests/015-exception-output b/client/bin/self-test/tests/015-exception-output
similarity index 100%
rename from bin/self-test/tests/015-exception-output
rename to client/bin/self-test/tests/015-exception-output
diff --git a/bin/self-test/tests/015-exception-output-out b/client/bin/self-test/tests/015-exception-output-out
similarity index 100%
rename from bin/self-test/tests/015-exception-output-out
rename to client/bin/self-test/tests/015-exception-output-out
diff --git a/bin/self-test/tests/017-system-exception b/client/bin/self-test/tests/017-system-exception
similarity index 100%
rename from bin/self-test/tests/017-system-exception
rename to client/bin/self-test/tests/017-system-exception
diff --git a/bin/self-test/tests/017-system-exception-out b/client/bin/self-test/tests/017-system-exception-out
similarity index 100%
rename from bin/self-test/tests/017-system-exception-out
rename to client/bin/self-test/tests/017-system-exception-out
diff --git a/bin/self-test/tests/020-parallel-basic b/client/bin/self-test/tests/020-parallel-basic
similarity index 100%
rename from bin/self-test/tests/020-parallel-basic
rename to client/bin/self-test/tests/020-parallel-basic
diff --git a/bin/self-test/tests/020-parallel-basic-out b/client/bin/self-test/tests/020-parallel-basic-out
similarity index 100%
rename from bin/self-test/tests/020-parallel-basic-out
rename to client/bin/self-test/tests/020-parallel-basic-out
diff --git a/bin/self-test/tests/030-stepper-basic b/client/bin/self-test/tests/030-stepper-basic
similarity index 100%
rename from bin/self-test/tests/030-stepper-basic
rename to client/bin/self-test/tests/030-stepper-basic
diff --git a/bin/self-test/tests/030-stepper-basic-out b/client/bin/self-test/tests/030-stepper-basic-out
similarity index 100%
rename from bin/self-test/tests/030-stepper-basic-out
rename to client/bin/self-test/tests/030-stepper-basic-out
diff --git a/bin/self-test/tests/031-stepper-chain b/client/bin/self-test/tests/031-stepper-chain
similarity index 100%
rename from bin/self-test/tests/031-stepper-chain
rename to client/bin/self-test/tests/031-stepper-chain
diff --git a/bin/self-test/tests/031-stepper-chain-out b/client/bin/self-test/tests/031-stepper-chain-out
similarity index 100%
rename from bin/self-test/tests/031-stepper-chain-out
rename to client/bin/self-test/tests/031-stepper-chain-out
diff --git a/bin/self-test/tests/032-stepper-list-order b/client/bin/self-test/tests/032-stepper-list-order
similarity index 100%
rename from bin/self-test/tests/032-stepper-list-order
rename to client/bin/self-test/tests/032-stepper-list-order
diff --git a/bin/self-test/tests/032-stepper-list-order-out b/client/bin/self-test/tests/032-stepper-list-order-out
similarity index 100%
rename from bin/self-test/tests/032-stepper-list-order-out
rename to client/bin/self-test/tests/032-stepper-list-order-out
diff --git a/bin/self-test/tests/033-stepper-parameters b/client/bin/self-test/tests/033-stepper-parameters
similarity index 100%
rename from bin/self-test/tests/033-stepper-parameters
rename to client/bin/self-test/tests/033-stepper-parameters
diff --git a/bin/self-test/tests/033-stepper-parameters-out b/client/bin/self-test/tests/033-stepper-parameters-out
similarity index 100%
rename from bin/self-test/tests/033-stepper-parameters-out
rename to client/bin/self-test/tests/033-stepper-parameters-out
diff --git a/bin/self-test/tests/034-stepper-iterate b/client/bin/self-test/tests/034-stepper-iterate
similarity index 100%
rename from bin/self-test/tests/034-stepper-iterate
rename to client/bin/self-test/tests/034-stepper-iterate
diff --git a/bin/self-test/tests/034-stepper-iterate-out b/client/bin/self-test/tests/034-stepper-iterate-out
similarity index 100%
rename from bin/self-test/tests/034-stepper-iterate-out
rename to client/bin/self-test/tests/034-stepper-iterate-out
diff --git a/bin/self-test/tests/040-stepper-boot-chain b/client/bin/self-test/tests/040-stepper-boot-chain
similarity index 100%
rename from bin/self-test/tests/040-stepper-boot-chain
rename to client/bin/self-test/tests/040-stepper-boot-chain
diff --git a/bin/self-test/tests/040-stepper-boot-chain-out b/client/bin/self-test/tests/040-stepper-boot-chain-out
similarity index 100%
rename from bin/self-test/tests/040-stepper-boot-chain-out
rename to client/bin/self-test/tests/040-stepper-boot-chain-out
diff --git a/bin/self-test/tests/042-stepper-boot-list-order b/client/bin/self-test/tests/042-stepper-boot-list-order
similarity index 100%
rename from bin/self-test/tests/042-stepper-boot-list-order
rename to client/bin/self-test/tests/042-stepper-boot-list-order
diff --git a/bin/self-test/tests/042-stepper-boot-list-order-out b/client/bin/self-test/tests/042-stepper-boot-list-order-out
similarity index 100%
rename from bin/self-test/tests/042-stepper-boot-list-order-out
rename to client/bin/self-test/tests/042-stepper-boot-list-order-out
diff --git a/bin/self-test/tests/043-stepper-boot-parameters b/client/bin/self-test/tests/043-stepper-boot-parameters
similarity index 100%
rename from bin/self-test/tests/043-stepper-boot-parameters
rename to client/bin/self-test/tests/043-stepper-boot-parameters
diff --git a/bin/self-test/tests/043-stepper-boot-parameters-out b/client/bin/self-test/tests/043-stepper-boot-parameters-out
similarity index 100%
rename from bin/self-test/tests/043-stepper-boot-parameters-out
rename to client/bin/self-test/tests/043-stepper-boot-parameters-out
diff --git a/bin/self-test/tests/044-stepper-boot-iterate b/client/bin/self-test/tests/044-stepper-boot-iterate
similarity index 100%
rename from bin/self-test/tests/044-stepper-boot-iterate
rename to client/bin/self-test/tests/044-stepper-boot-iterate
diff --git a/bin/self-test/tests/044-stepper-boot-iterate-out b/client/bin/self-test/tests/044-stepper-boot-iterate-out
similarity index 100%
rename from bin/self-test/tests/044-stepper-boot-iterate-out
rename to client/bin/self-test/tests/044-stepper-boot-iterate-out
diff --git a/bin/self-test/tests/080-sequencer b/client/bin/self-test/tests/080-sequencer
similarity index 100%
rename from bin/self-test/tests/080-sequencer
rename to client/bin/self-test/tests/080-sequencer
diff --git a/bin/self-test/tests/080-sequencer-out b/client/bin/self-test/tests/080-sequencer-out
similarity index 100%
rename from bin/self-test/tests/080-sequencer-out
rename to client/bin/self-test/tests/080-sequencer-out
diff --git a/bin/self-test/tests/085-test-exception b/client/bin/self-test/tests/085-test-exception
similarity index 100%
rename from bin/self-test/tests/085-test-exception
rename to client/bin/self-test/tests/085-test-exception
diff --git a/bin/self-test/tests/085-test-exception-out b/client/bin/self-test/tests/085-test-exception-out
similarity index 100%
rename from bin/self-test/tests/085-test-exception-out
rename to client/bin/self-test/tests/085-test-exception-out
diff --git a/bin/self-test/tests/087-test-output b/client/bin/self-test/tests/087-test-output
similarity index 100%
rename from bin/self-test/tests/087-test-output
rename to client/bin/self-test/tests/087-test-output
diff --git a/bin/self-test/tests/087-test-output-out b/client/bin/self-test/tests/087-test-output-out
similarity index 100%
rename from bin/self-test/tests/087-test-output-out
rename to client/bin/self-test/tests/087-test-output-out
diff --git a/bin/self-test/tests/100-barrier-2x-master-first b/client/bin/self-test/tests/100-barrier-2x-master-first
similarity index 100%
rename from bin/self-test/tests/100-barrier-2x-master-first
rename to client/bin/self-test/tests/100-barrier-2x-master-first
diff --git a/bin/self-test/tests/100-barrier-2x-master-first-out b/client/bin/self-test/tests/100-barrier-2x-master-first-out
similarity index 100%
rename from bin/self-test/tests/100-barrier-2x-master-first-out
rename to client/bin/self-test/tests/100-barrier-2x-master-first-out
diff --git a/bin/self-test/tests/101-barrier-2x-slave-first b/client/bin/self-test/tests/101-barrier-2x-slave-first
similarity index 100%
rename from bin/self-test/tests/101-barrier-2x-slave-first
rename to client/bin/self-test/tests/101-barrier-2x-slave-first
diff --git a/bin/self-test/tests/101-barrier-2x-slave-first-out b/client/bin/self-test/tests/101-barrier-2x-slave-first-out
similarity index 100%
rename from bin/self-test/tests/101-barrier-2x-slave-first-out
rename to client/bin/self-test/tests/101-barrier-2x-slave-first-out
diff --git a/bin/self-test/tests/102-barrier-2x-master-only b/client/bin/self-test/tests/102-barrier-2x-master-only
similarity index 100%
rename from bin/self-test/tests/102-barrier-2x-master-only
rename to client/bin/self-test/tests/102-barrier-2x-master-only
diff --git a/bin/self-test/tests/102-barrier-2x-master-only-out b/client/bin/self-test/tests/102-barrier-2x-master-only-out
similarity index 100%
rename from bin/self-test/tests/102-barrier-2x-master-only-out
rename to client/bin/self-test/tests/102-barrier-2x-master-only-out
diff --git a/bin/self-test/tests/103-barrier-2x-slave-only b/client/bin/self-test/tests/103-barrier-2x-slave-only
similarity index 100%
rename from bin/self-test/tests/103-barrier-2x-slave-only
rename to client/bin/self-test/tests/103-barrier-2x-slave-only
diff --git a/bin/self-test/tests/103-barrier-2x-slave-only-out b/client/bin/self-test/tests/103-barrier-2x-slave-only-out
similarity index 100%
rename from bin/self-test/tests/103-barrier-2x-slave-only-out
rename to client/bin/self-test/tests/103-barrier-2x-slave-only-out
diff --git a/bin/self-test/tests/105-barrier-5x-master-middle b/client/bin/self-test/tests/105-barrier-5x-master-middle
similarity index 100%
rename from bin/self-test/tests/105-barrier-5x-master-middle
rename to client/bin/self-test/tests/105-barrier-5x-master-middle
diff --git a/bin/self-test/tests/105-barrier-5x-master-middle-out b/client/bin/self-test/tests/105-barrier-5x-master-middle-out
similarity index 100%
rename from bin/self-test/tests/105-barrier-5x-master-middle-out
rename to client/bin/self-test/tests/105-barrier-5x-master-middle-out
diff --git a/bin/self-test/tests/110-barrier-unordered-10x b/client/bin/self-test/tests/110-barrier-unordered-10x
similarity index 100%
rename from bin/self-test/tests/110-barrier-unordered-10x
rename to client/bin/self-test/tests/110-barrier-unordered-10x
diff --git a/bin/self-test/tests/110-barrier-unordered-10x-out b/client/bin/self-test/tests/110-barrier-unordered-10x-out
similarity index 100%
rename from bin/self-test/tests/110-barrier-unordered-10x-out
rename to client/bin/self-test/tests/110-barrier-unordered-10x-out
diff --git a/bin/self-test/tests/111-barrier-unordered-20x b/client/bin/self-test/tests/111-barrier-unordered-20x
similarity index 100%
rename from bin/self-test/tests/111-barrier-unordered-20x
rename to client/bin/self-test/tests/111-barrier-unordered-20x
diff --git a/bin/self-test/tests/111-barrier-unordered-20x-out b/client/bin/self-test/tests/111-barrier-unordered-20x-out
similarity index 100%
rename from bin/self-test/tests/111-barrier-unordered-20x-out
rename to client/bin/self-test/tests/111-barrier-unordered-20x-out
diff --git a/bin/self-test/tests/112-barrier-unordered-40x b/client/bin/self-test/tests/112-barrier-unordered-40x
similarity index 100%
rename from bin/self-test/tests/112-barrier-unordered-40x
rename to client/bin/self-test/tests/112-barrier-unordered-40x
diff --git a/bin/self-test/tests/112-barrier-unordered-40x-out b/client/bin/self-test/tests/112-barrier-unordered-40x-out
similarity index 100%
rename from bin/self-test/tests/112-barrier-unordered-40x-out
rename to client/bin/self-test/tests/112-barrier-unordered-40x-out
diff --git a/bin/self-test/tests/113-barrier-unordered-100x b/client/bin/self-test/tests/113-barrier-unordered-100x
similarity index 100%
rename from bin/self-test/tests/113-barrier-unordered-100x
rename to client/bin/self-test/tests/113-barrier-unordered-100x
diff --git a/bin/self-test/tests/113-barrier-unordered-100x-out b/client/bin/self-test/tests/113-barrier-unordered-100x-out
similarity index 100%
rename from bin/self-test/tests/113-barrier-unordered-100x-out
rename to client/bin/self-test/tests/113-barrier-unordered-100x-out
diff --git a/bin/self-test/tests/NNN-filter b/client/bin/self-test/tests/NNN-filter
similarity index 100%
rename from bin/self-test/tests/NNN-filter
rename to client/bin/self-test/tests/NNN-filter
diff --git a/bin/sysinfo.py b/client/bin/sysinfo.py
similarity index 100%
rename from bin/sysinfo.py
rename to client/bin/sysinfo.py
diff --git a/bin/test.py b/client/bin/test.py
similarity index 100%
rename from bin/test.py
rename to client/bin/test.py