diff --git a/Code/Tools/cxxtest/COPYING b/Code/Mantid/TestingTools/cxxtest/COPYING
similarity index 100%
rename from Code/Tools/cxxtest/COPYING
rename to Code/Mantid/TestingTools/cxxtest/COPYING
diff --git a/Code/Tools/cxxtest/README b/Code/Mantid/TestingTools/cxxtest/README
similarity index 100%
rename from Code/Tools/cxxtest/README
rename to Code/Mantid/TestingTools/cxxtest/README
diff --git a/Code/Tools/cxxtest/TODO b/Code/Mantid/TestingTools/cxxtest/TODO
similarity index 100%
rename from Code/Tools/cxxtest/TODO
rename to Code/Mantid/TestingTools/cxxtest/TODO
diff --git a/Code/Tools/cxxtest/Versions b/Code/Mantid/TestingTools/cxxtest/Versions
similarity index 100%
rename from Code/Tools/cxxtest/Versions
rename to Code/Mantid/TestingTools/cxxtest/Versions
diff --git a/Code/Tools/cxxtest/build_tools/SCons/AUTHORS b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/AUTHORS
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/AUTHORS
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/AUTHORS
diff --git a/Code/Tools/cxxtest/build_tools/SCons/cxxtest.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/cxxtest.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/cxxtest.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/cxxtest.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/default_env/README b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/default_env/README
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/default_env/README
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/default_env/README
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/default_env/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/default_env/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/default_env/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/default_env/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/default_env/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/default_env/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/default_env/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/default_env/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/README b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/README
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/README
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/README
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/requirement.hpp b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/requirement.hpp
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/requirement.hpp
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/requirement.hpp
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/test_bar.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/test_bar.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/test_bar.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/test_bar.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/test_foo.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/test_foo.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/empty_source_list/test_foo.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/empty_source_list/test_foo.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/eprouvette.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/eprouvette.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/eprouvette.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/eprouvette.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/expanding_#/README b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/expanding_#/README
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/expanding_#/README
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/expanding_#/README
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/expanding_#/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/expanding_#/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/expanding_#/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/expanding_#/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/expanding_#/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/expanding_#/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/expanding_#/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/expanding_#/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing/README b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/README
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing/README
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/README
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing/src/requirement.cpp b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/src/requirement.cpp
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing/src/requirement.cpp
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/src/requirement.cpp
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing/src/requirement.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/src/requirement.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing/src/requirement.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/src/requirement.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing/src/test_bar.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/src/test_bar.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing/src/test_bar.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/src/test_bar.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing/src/test_foo.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/src/test_foo.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing/src/test_foo.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing/src/test_foo.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/README b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/README
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/README
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/README
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hello.cc b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/hello.cc
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hello.cc
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/hello.cc
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hello.hh b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/hello.hh
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hello.hh
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/hello.hh
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hellotest.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/hellotest.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/hellotest.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/hellotest.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/main.cpp b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/main.cpp
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/globbing_edmundo/main.cpp
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/globbing_edmundo/main.cpp
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/README b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/README
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/README
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/README
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/src/not-with-pedantic.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/src/not-with-pedantic.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/src/not-with-pedantic.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/src/not-with-pedantic.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/src/only_with_ansi.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/src/only_with_ansi.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CCFLAGS/src/only_with_ansi.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CCFLAGS/src/only_with_ansi.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/README b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/README
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/README
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/README
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/src/not-with-pedantic.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/src/not-with-pedantic.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/src/not-with-pedantic.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/include_CXXFLAGS/src/not-with-pedantic.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/src/requirement.cpp b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/src/requirement.cpp
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/src/requirement.cpp
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/src/requirement.cpp
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/src/requirement.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/src/requirement.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/src/requirement.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/src/requirement.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/src/test_bar.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/src/test_bar.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/src/test_bar.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/src/test_bar.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/src/test_foo.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/src/test_foo.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/multifile_tests/src/test_foo.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/multifile_tests/src/test_foo.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/need_cpppath/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/need_cpppath/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/need_cpppath/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/need_cpppath/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/need_cpppath/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/need_cpppath/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/need_cpppath/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/need_cpppath/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/need_cpppath/src/cpppath.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/need_cpppath/src/cpppath.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/need_cpppath/src/cpppath.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/need_cpppath/src/cpppath.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/need_cpppath/src/cpppathdir/include.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/need_cpppath/src/cpppathdir/include.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/need_cpppath/src/cpppathdir/include.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/need_cpppath/src/cpppathdir/include.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/nonstandard_cxxtest_dir/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/nonstandard_cxxtest_dir/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/nonstandard_cxxtest_dir/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/nonstandard_cxxtest_dir/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/nonstandard_cxxtest_dir/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/nonstandard_cxxtest_dir/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/nonstandard_cxxtest_dir/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/nonstandard_cxxtest_dir/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/printer_propagation/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/printer_propagation/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/printer_propagation/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/printer_propagation/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/printer_propagation/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/printer_propagation/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/printer_propagation/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/printer_propagation/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/printer_propagation/cxxtest/CrazyRunner.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/printer_propagation/cxxtest/CrazyRunner.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/printer_propagation/cxxtest/CrazyRunner.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/printer_propagation/cxxtest/CrazyRunner.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/printer_propagation/src/failtest.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/printer_propagation/src/failtest.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/printer_propagation/src/failtest.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/printer_propagation/src/failtest.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/README b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/README
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/README
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/README
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/src/requirement.cpp b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/src/requirement.cpp
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/src/requirement.cpp
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/src/requirement.cpp
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/src/requirement.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/src/requirement.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/src/requirement.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/src/requirement.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/src/test_bar.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/src/test_bar.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/src/test_bar.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/src/test_bar.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/src/test_foo.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/src/test_foo.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/recursive_sources/src/test_foo.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/recursive_sources/src/test_foo.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/string_cpppath/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/string_cpppath/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/string_cpppath/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/string_cpppath/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/string_cpppath/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/string_cpppath/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/string_cpppath/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/string_cpppath/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/string_cpppath/src/cpppath.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/string_cpppath/src/cpppath.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/string_cpppath/src/cpppath.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/string_cpppath/src/cpppath.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/string_cpppath/src/cpppathdir/include.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/string_cpppath/src/cpppathdir/include.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/string_cpppath/src/cpppathdir/include.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/string_cpppath/src/cpppathdir/include.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/target_syntax/SConstruct b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/target_syntax/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/target_syntax/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/target_syntax/SConstruct
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/target_syntax/TestDef.py b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/target_syntax/TestDef.py
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/target_syntax/TestDef.py
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/target_syntax/TestDef.py
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/target_syntax/src/cpppath.t.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/target_syntax/src/cpppath.t.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/target_syntax/src/cpppath.t.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/target_syntax/src/cpppath.t.h
diff --git a/Code/Tools/cxxtest/build_tools/SCons/test/target_syntax/src/cpppathdir/include.h b/Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/target_syntax/src/cpppathdir/include.h
similarity index 100%
rename from Code/Tools/cxxtest/build_tools/SCons/test/target_syntax/src/cpppathdir/include.h
rename to Code/Mantid/TestingTools/cxxtest/build_tools/SCons/test/target_syntax/src/cpppathdir/include.h
diff --git a/Code/Tools/cxxtest/cxxtest.spec b/Code/Mantid/TestingTools/cxxtest/cxxtest.spec
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest.spec
rename to Code/Mantid/TestingTools/cxxtest/cxxtest.spec
diff --git a/Code/Tools/cxxtest/cxxtest/Descriptions.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/Descriptions.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/Descriptions.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/Descriptions.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/Descriptions.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/Descriptions.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/Descriptions.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/Descriptions.h
diff --git a/Code/Tools/cxxtest/cxxtest/DummyDescriptions.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/DummyDescriptions.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/DummyDescriptions.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/DummyDescriptions.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/DummyDescriptions.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/DummyDescriptions.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/DummyDescriptions.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/DummyDescriptions.h
diff --git a/Code/Tools/cxxtest/cxxtest/ErrorFormatter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/ErrorFormatter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/ErrorFormatter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/ErrorFormatter.h
diff --git a/Code/Tools/cxxtest/cxxtest/ErrorPrinter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/ErrorPrinter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/ErrorPrinter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/ErrorPrinter.h
diff --git a/Code/Tools/cxxtest/cxxtest/Flags.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/Flags.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/Flags.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/Flags.h
diff --git a/Code/Tools/cxxtest/cxxtest/GlobalFixture.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/GlobalFixture.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/GlobalFixture.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/GlobalFixture.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/GlobalFixture.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/GlobalFixture.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/GlobalFixture.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/GlobalFixture.h
diff --git a/Code/Tools/cxxtest/cxxtest/Gui.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/Gui.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/Gui.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/Gui.h
diff --git a/Code/Tools/cxxtest/cxxtest/LinkedList.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/LinkedList.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/LinkedList.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/LinkedList.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/LinkedList.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/LinkedList.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/LinkedList.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/LinkedList.h
diff --git a/Code/Tools/cxxtest/cxxtest/MantidFormatter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/MantidFormatter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/MantidFormatter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/MantidFormatter.h
diff --git a/Code/Tools/cxxtest/cxxtest/MantidPrinter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/MantidPrinter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/MantidPrinter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/MantidPrinter.h
diff --git a/Code/Tools/cxxtest/cxxtest/Mock.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/Mock.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/Mock.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/Mock.h
diff --git a/Code/Tools/cxxtest/cxxtest/ParenPrinter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/ParenPrinter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/ParenPrinter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/ParenPrinter.h
diff --git a/Code/Tools/cxxtest/cxxtest/QtGui.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/QtGui.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/QtGui.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/QtGui.h
diff --git a/Code/Tools/cxxtest/cxxtest/RealDescriptions.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/RealDescriptions.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/RealDescriptions.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/RealDescriptions.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/RealDescriptions.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/RealDescriptions.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/RealDescriptions.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/RealDescriptions.h
diff --git a/Code/Tools/cxxtest/cxxtest/Root.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/Root.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/Root.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/Root.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/SelfTest.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/SelfTest.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/SelfTest.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/SelfTest.h
diff --git a/Code/Tools/cxxtest/cxxtest/StdHeaders.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/StdHeaders.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/StdHeaders.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/StdHeaders.h
diff --git a/Code/Tools/cxxtest/cxxtest/StdTestSuite.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/StdTestSuite.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/StdTestSuite.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/StdTestSuite.h
diff --git a/Code/Tools/cxxtest/cxxtest/StdValueTraits.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/StdValueTraits.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/StdValueTraits.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/StdValueTraits.h
diff --git a/Code/Tools/cxxtest/cxxtest/StdioFilePrinter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/StdioFilePrinter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/StdioFilePrinter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/StdioFilePrinter.h
diff --git a/Code/Tools/cxxtest/cxxtest/StdioPrinter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/StdioPrinter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/StdioPrinter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/StdioPrinter.h
diff --git a/Code/Tools/cxxtest/cxxtest/TeeListener.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/TeeListener.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/TeeListener.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/TeeListener.h
diff --git a/Code/Tools/cxxtest/cxxtest/TestListener.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/TestListener.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/TestListener.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/TestListener.h
diff --git a/Code/Tools/cxxtest/cxxtest/TestMain.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/TestMain.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/TestMain.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/TestMain.h
diff --git a/Code/Tools/cxxtest/cxxtest/TestRunner.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/TestRunner.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/TestRunner.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/TestRunner.h
diff --git a/Code/Tools/cxxtest/cxxtest/TestSuite.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/TestSuite.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/TestSuite.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/TestSuite.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/TestSuite.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/TestSuite.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/TestSuite.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/TestSuite.h
diff --git a/Code/Tools/cxxtest/cxxtest/TestTracker.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/TestTracker.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/TestTracker.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/TestTracker.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/TestTracker.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/TestTracker.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/TestTracker.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/TestTracker.h
diff --git a/Code/Tools/cxxtest/cxxtest/ValueTraits.cpp b/Code/Mantid/TestingTools/cxxtest/cxxtest/ValueTraits.cpp
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/ValueTraits.cpp
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/ValueTraits.cpp
diff --git a/Code/Tools/cxxtest/cxxtest/ValueTraits.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/ValueTraits.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/ValueTraits.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/ValueTraits.h
diff --git a/Code/Tools/cxxtest/cxxtest/Win32Gui.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/Win32Gui.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/Win32Gui.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/Win32Gui.h
diff --git a/Code/Tools/cxxtest/cxxtest/X11Gui.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/X11Gui.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/X11Gui.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/X11Gui.h
diff --git a/Code/Tools/cxxtest/cxxtest/XUnitPrinter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/XUnitPrinter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/XUnitPrinter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/XUnitPrinter.h
diff --git a/Code/Tools/cxxtest/cxxtest/XmlFormatter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/XmlFormatter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/XmlFormatter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/XmlFormatter.h
diff --git a/Code/Tools/cxxtest/cxxtest/XmlPrinter.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/XmlPrinter.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/XmlPrinter.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/XmlPrinter.h
diff --git a/Code/Tools/cxxtest/cxxtest/YesNoRunner.h b/Code/Mantid/TestingTools/cxxtest/cxxtest/YesNoRunner.h
similarity index 100%
rename from Code/Tools/cxxtest/cxxtest/YesNoRunner.h
rename to Code/Mantid/TestingTools/cxxtest/cxxtest/YesNoRunner.h
diff --git a/Code/Tools/cxxtest/docs/.cvsignore b/Code/Mantid/TestingTools/cxxtest/docs/.cvsignore
similarity index 100%
rename from Code/Tools/cxxtest/docs/.cvsignore
rename to Code/Mantid/TestingTools/cxxtest/docs/.cvsignore
diff --git a/Code/Tools/cxxtest/docs/Makefile b/Code/Mantid/TestingTools/cxxtest/docs/Makefile
similarity index 100%
rename from Code/Tools/cxxtest/docs/Makefile
rename to Code/Mantid/TestingTools/cxxtest/docs/Makefile
diff --git a/Code/Tools/cxxtest/docs/convert.pl b/Code/Mantid/TestingTools/cxxtest/docs/convert.pl
similarity index 100%
rename from Code/Tools/cxxtest/docs/convert.pl
rename to Code/Mantid/TestingTools/cxxtest/docs/convert.pl
diff --git a/Code/Tools/cxxtest/docs/guide.texi b/Code/Mantid/TestingTools/cxxtest/docs/guide.texi
similarity index 100%
rename from Code/Tools/cxxtest/docs/guide.texi
rename to Code/Mantid/TestingTools/cxxtest/docs/guide.texi
diff --git a/Code/Tools/cxxtest/docs/qt.png b/Code/Mantid/TestingTools/cxxtest/docs/qt.png
similarity index 100%
rename from Code/Tools/cxxtest/docs/qt.png
rename to Code/Mantid/TestingTools/cxxtest/docs/qt.png
diff --git a/Code/Tools/cxxtest/docs/qt2.png b/Code/Mantid/TestingTools/cxxtest/docs/qt2.png
similarity index 100%
rename from Code/Tools/cxxtest/docs/qt2.png
rename to Code/Mantid/TestingTools/cxxtest/docs/qt2.png
diff --git a/Code/Tools/cxxtest/docs/texinfo.tex b/Code/Mantid/TestingTools/cxxtest/docs/texinfo.tex
similarity index 100%
rename from Code/Tools/cxxtest/docs/texinfo.tex
rename to Code/Mantid/TestingTools/cxxtest/docs/texinfo.tex
diff --git a/Code/Tools/cxxtest/docs/win32.png b/Code/Mantid/TestingTools/cxxtest/docs/win32.png
similarity index 100%
rename from Code/Tools/cxxtest/docs/win32.png
rename to Code/Mantid/TestingTools/cxxtest/docs/win32.png
diff --git a/Code/Tools/cxxtest/docs/x11.png b/Code/Mantid/TestingTools/cxxtest/docs/x11.png
similarity index 100%
rename from Code/Tools/cxxtest/docs/x11.png
rename to Code/Mantid/TestingTools/cxxtest/docs/x11.png
diff --git a/Code/Tools/cxxtest/get_revision_from_cvs.pl b/Code/Mantid/TestingTools/cxxtest/get_revision_from_cvs.pl
similarity index 100%
rename from Code/Tools/cxxtest/get_revision_from_cvs.pl
rename to Code/Mantid/TestingTools/cxxtest/get_revision_from_cvs.pl
diff --git a/Code/Tools/cxxtest/python/README.txt b/Code/Mantid/TestingTools/cxxtest/python/README.txt
similarity index 100%
rename from Code/Tools/cxxtest/python/README.txt
rename to Code/Mantid/TestingTools/cxxtest/python/README.txt
diff --git a/Code/Tools/cxxtest/python/cxxtest/__init__.py b/Code/Mantid/TestingTools/cxxtest/python/cxxtest/__init__.py
similarity index 100%
rename from Code/Tools/cxxtest/python/cxxtest/__init__.py
rename to Code/Mantid/TestingTools/cxxtest/python/cxxtest/__init__.py
diff --git a/Code/Tools/cxxtest/python/cxxtest/__release__.py b/Code/Mantid/TestingTools/cxxtest/python/cxxtest/__release__.py
similarity index 100%
rename from Code/Tools/cxxtest/python/cxxtest/__release__.py
rename to Code/Mantid/TestingTools/cxxtest/python/cxxtest/__release__.py
diff --git a/Code/Tools/cxxtest/python/cxxtest/cxxtest_misc.py b/Code/Mantid/TestingTools/cxxtest/python/cxxtest/cxxtest_misc.py
similarity index 100%
rename from Code/Tools/cxxtest/python/cxxtest/cxxtest_misc.py
rename to Code/Mantid/TestingTools/cxxtest/python/cxxtest/cxxtest_misc.py
diff --git a/Code/Tools/cxxtest/python/cxxtest/cxxtest_parser.py b/Code/Mantid/TestingTools/cxxtest/python/cxxtest/cxxtest_parser.py
similarity index 100%
rename from Code/Tools/cxxtest/python/cxxtest/cxxtest_parser.py
rename to Code/Mantid/TestingTools/cxxtest/python/cxxtest/cxxtest_parser.py
diff --git a/Code/Tools/cxxtest/python/cxxtest/cxxtestgen.py b/Code/Mantid/TestingTools/cxxtest/python/cxxtest/cxxtestgen.py
similarity index 100%
rename from Code/Tools/cxxtest/python/cxxtest/cxxtestgen.py
rename to Code/Mantid/TestingTools/cxxtest/python/cxxtest/cxxtestgen.py
diff --git a/Code/Tools/cxxtest/python/ez_setup.py b/Code/Mantid/TestingTools/cxxtest/python/ez_setup.py
similarity index 100%
rename from Code/Tools/cxxtest/python/ez_setup.py
rename to Code/Mantid/TestingTools/cxxtest/python/ez_setup.py
diff --git a/Code/Tools/cxxtest/python/scripts/cxxtestgen b/Code/Mantid/TestingTools/cxxtest/python/scripts/cxxtestgen
similarity index 100%
rename from Code/Tools/cxxtest/python/scripts/cxxtestgen
rename to Code/Mantid/TestingTools/cxxtest/python/scripts/cxxtestgen
diff --git a/Code/Tools/cxxtest/python/setup.py b/Code/Mantid/TestingTools/cxxtest/python/setup.py
similarity index 100%
rename from Code/Tools/cxxtest/python/setup.py
rename to Code/Mantid/TestingTools/cxxtest/python/setup.py
diff --git a/Code/Tools/cxxtest/sample/.cvsignore b/Code/Mantid/TestingTools/cxxtest/sample/.cvsignore
similarity index 100%
rename from Code/Tools/cxxtest/sample/.cvsignore
rename to Code/Mantid/TestingTools/cxxtest/sample/.cvsignore
diff --git a/Code/Tools/cxxtest/sample/Construct b/Code/Mantid/TestingTools/cxxtest/sample/Construct
similarity index 100%
rename from Code/Tools/cxxtest/sample/Construct
rename to Code/Mantid/TestingTools/cxxtest/sample/Construct
diff --git a/Code/Tools/cxxtest/sample/CreatedTest.h b/Code/Mantid/TestingTools/cxxtest/sample/CreatedTest.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/CreatedTest.h
rename to Code/Mantid/TestingTools/cxxtest/sample/CreatedTest.h
diff --git a/Code/Tools/cxxtest/sample/DeltaTest.h b/Code/Mantid/TestingTools/cxxtest/sample/DeltaTest.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/DeltaTest.h
rename to Code/Mantid/TestingTools/cxxtest/sample/DeltaTest.h
diff --git a/Code/Tools/cxxtest/sample/EnumTraits.h b/Code/Mantid/TestingTools/cxxtest/sample/EnumTraits.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/EnumTraits.h
rename to Code/Mantid/TestingTools/cxxtest/sample/EnumTraits.h
diff --git a/Code/Tools/cxxtest/sample/ExceptionTest.h b/Code/Mantid/TestingTools/cxxtest/sample/ExceptionTest.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/ExceptionTest.h
rename to Code/Mantid/TestingTools/cxxtest/sample/ExceptionTest.h
diff --git a/Code/Tools/cxxtest/sample/FixtureTest.h b/Code/Mantid/TestingTools/cxxtest/sample/FixtureTest.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/FixtureTest.h
rename to Code/Mantid/TestingTools/cxxtest/sample/FixtureTest.h
diff --git a/Code/Tools/cxxtest/sample/Makefile.PL b/Code/Mantid/TestingTools/cxxtest/sample/Makefile.PL
similarity index 100%
rename from Code/Tools/cxxtest/sample/Makefile.PL
rename to Code/Mantid/TestingTools/cxxtest/sample/Makefile.PL
diff --git a/Code/Tools/cxxtest/sample/Makefile.bcc32 b/Code/Mantid/TestingTools/cxxtest/sample/Makefile.bcc32
similarity index 100%
rename from Code/Tools/cxxtest/sample/Makefile.bcc32
rename to Code/Mantid/TestingTools/cxxtest/sample/Makefile.bcc32
diff --git a/Code/Tools/cxxtest/sample/Makefile.msvc b/Code/Mantid/TestingTools/cxxtest/sample/Makefile.msvc
similarity index 100%
rename from Code/Tools/cxxtest/sample/Makefile.msvc
rename to Code/Mantid/TestingTools/cxxtest/sample/Makefile.msvc
diff --git a/Code/Tools/cxxtest/sample/Makefile.unix b/Code/Mantid/TestingTools/cxxtest/sample/Makefile.unix
similarity index 100%
rename from Code/Tools/cxxtest/sample/Makefile.unix
rename to Code/Mantid/TestingTools/cxxtest/sample/Makefile.unix
diff --git a/Code/Tools/cxxtest/sample/MessageTest.h b/Code/Mantid/TestingTools/cxxtest/sample/MessageTest.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/MessageTest.h
rename to Code/Mantid/TestingTools/cxxtest/sample/MessageTest.h
diff --git a/Code/Tools/cxxtest/sample/SCons/SConstruct b/Code/Mantid/TestingTools/cxxtest/sample/SCons/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/sample/SCons/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/sample/SCons/SConstruct
diff --git a/Code/Tools/cxxtest/sample/SCons/include/stack.h b/Code/Mantid/TestingTools/cxxtest/sample/SCons/include/stack.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/SCons/include/stack.h
rename to Code/Mantid/TestingTools/cxxtest/sample/SCons/include/stack.h
diff --git a/Code/Tools/cxxtest/sample/SCons/src/stack.c b/Code/Mantid/TestingTools/cxxtest/sample/SCons/src/stack.c
similarity index 100%
rename from Code/Tools/cxxtest/sample/SCons/src/stack.c
rename to Code/Mantid/TestingTools/cxxtest/sample/SCons/src/stack.c
diff --git a/Code/Tools/cxxtest/sample/SCons/tests/stack_test.h b/Code/Mantid/TestingTools/cxxtest/sample/SCons/tests/stack_test.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/SCons/tests/stack_test.h
rename to Code/Mantid/TestingTools/cxxtest/sample/SCons/tests/stack_test.h
diff --git a/Code/Tools/cxxtest/sample/SimpleTest.h b/Code/Mantid/TestingTools/cxxtest/sample/SimpleTest.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/SimpleTest.h
rename to Code/Mantid/TestingTools/cxxtest/sample/SimpleTest.h
diff --git a/Code/Tools/cxxtest/sample/TraitsTest.h b/Code/Mantid/TestingTools/cxxtest/sample/TraitsTest.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/TraitsTest.h
rename to Code/Mantid/TestingTools/cxxtest/sample/TraitsTest.h
diff --git a/Code/Tools/cxxtest/sample/aborter.tpl b/Code/Mantid/TestingTools/cxxtest/sample/aborter.tpl
similarity index 100%
rename from Code/Tools/cxxtest/sample/aborter.tpl
rename to Code/Mantid/TestingTools/cxxtest/sample/aborter.tpl
diff --git a/Code/Tools/cxxtest/sample/file_printer.tpl b/Code/Mantid/TestingTools/cxxtest/sample/file_printer.tpl
similarity index 100%
rename from Code/Tools/cxxtest/sample/file_printer.tpl
rename to Code/Mantid/TestingTools/cxxtest/sample/file_printer.tpl
diff --git a/Code/Tools/cxxtest/sample/gui/GreenYellowRed.h b/Code/Mantid/TestingTools/cxxtest/sample/gui/GreenYellowRed.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/gui/GreenYellowRed.h
rename to Code/Mantid/TestingTools/cxxtest/sample/gui/GreenYellowRed.h
diff --git a/Code/Tools/cxxtest/sample/mock/Dice.cpp b/Code/Mantid/TestingTools/cxxtest/sample/mock/Dice.cpp
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/Dice.cpp
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/Dice.cpp
diff --git a/Code/Tools/cxxtest/sample/mock/Dice.h b/Code/Mantid/TestingTools/cxxtest/sample/mock/Dice.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/Dice.h
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/Dice.h
diff --git a/Code/Tools/cxxtest/sample/mock/Makefile b/Code/Mantid/TestingTools/cxxtest/sample/mock/Makefile
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/Makefile
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/Makefile
diff --git a/Code/Tools/cxxtest/sample/mock/MockStdlib.h b/Code/Mantid/TestingTools/cxxtest/sample/mock/MockStdlib.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/MockStdlib.h
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/MockStdlib.h
diff --git a/Code/Tools/cxxtest/sample/mock/T/stdlib.h b/Code/Mantid/TestingTools/cxxtest/sample/mock/T/stdlib.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/T/stdlib.h
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/T/stdlib.h
diff --git a/Code/Tools/cxxtest/sample/mock/TestDice.h b/Code/Mantid/TestingTools/cxxtest/sample/mock/TestDice.h
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/TestDice.h
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/TestDice.h
diff --git a/Code/Tools/cxxtest/sample/mock/mock_stdlib.cpp b/Code/Mantid/TestingTools/cxxtest/sample/mock/mock_stdlib.cpp
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/mock_stdlib.cpp
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/mock_stdlib.cpp
diff --git a/Code/Tools/cxxtest/sample/mock/real_stdlib.cpp b/Code/Mantid/TestingTools/cxxtest/sample/mock/real_stdlib.cpp
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/real_stdlib.cpp
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/real_stdlib.cpp
diff --git a/Code/Tools/cxxtest/sample/mock/roll.cpp b/Code/Mantid/TestingTools/cxxtest/sample/mock/roll.cpp
similarity index 100%
rename from Code/Tools/cxxtest/sample/mock/roll.cpp
rename to Code/Mantid/TestingTools/cxxtest/sample/mock/roll.cpp
diff --git a/Code/Tools/cxxtest/sample/msvc/CxxTest_1_Run.dsp b/Code/Mantid/TestingTools/cxxtest/sample/msvc/CxxTest_1_Run.dsp
similarity index 100%
rename from Code/Tools/cxxtest/sample/msvc/CxxTest_1_Run.dsp
rename to Code/Mantid/TestingTools/cxxtest/sample/msvc/CxxTest_1_Run.dsp
diff --git a/Code/Tools/cxxtest/sample/msvc/CxxTest_2_Build.dsp b/Code/Mantid/TestingTools/cxxtest/sample/msvc/CxxTest_2_Build.dsp
similarity index 100%
rename from Code/Tools/cxxtest/sample/msvc/CxxTest_2_Build.dsp
rename to Code/Mantid/TestingTools/cxxtest/sample/msvc/CxxTest_2_Build.dsp
diff --git a/Code/Tools/cxxtest/sample/msvc/CxxTest_3_Generate.dsp b/Code/Mantid/TestingTools/cxxtest/sample/msvc/CxxTest_3_Generate.dsp
similarity index 100%
rename from Code/Tools/cxxtest/sample/msvc/CxxTest_3_Generate.dsp
rename to Code/Mantid/TestingTools/cxxtest/sample/msvc/CxxTest_3_Generate.dsp
diff --git a/Code/Tools/cxxtest/sample/msvc/CxxTest_Workspace.dsw b/Code/Mantid/TestingTools/cxxtest/sample/msvc/CxxTest_Workspace.dsw
similarity index 100%
rename from Code/Tools/cxxtest/sample/msvc/CxxTest_Workspace.dsw
rename to Code/Mantid/TestingTools/cxxtest/sample/msvc/CxxTest_Workspace.dsw
diff --git a/Code/Tools/cxxtest/sample/msvc/FixFiles.bat b/Code/Mantid/TestingTools/cxxtest/sample/msvc/FixFiles.bat
similarity index 100%
rename from Code/Tools/cxxtest/sample/msvc/FixFiles.bat
rename to Code/Mantid/TestingTools/cxxtest/sample/msvc/FixFiles.bat
diff --git a/Code/Tools/cxxtest/sample/msvc/Makefile b/Code/Mantid/TestingTools/cxxtest/sample/msvc/Makefile
similarity index 100%
rename from Code/Tools/cxxtest/sample/msvc/Makefile
rename to Code/Mantid/TestingTools/cxxtest/sample/msvc/Makefile
diff --git a/Code/Tools/cxxtest/sample/msvc/ReadMe.txt b/Code/Mantid/TestingTools/cxxtest/sample/msvc/ReadMe.txt
similarity index 100%
rename from Code/Tools/cxxtest/sample/msvc/ReadMe.txt
rename to Code/Mantid/TestingTools/cxxtest/sample/msvc/ReadMe.txt
diff --git a/Code/Tools/cxxtest/sample/only.tpl b/Code/Mantid/TestingTools/cxxtest/sample/only.tpl
similarity index 100%
rename from Code/Tools/cxxtest/sample/only.tpl
rename to Code/Mantid/TestingTools/cxxtest/sample/only.tpl
diff --git a/Code/Tools/cxxtest/sample/parts/.cvsignore b/Code/Mantid/TestingTools/cxxtest/sample/parts/.cvsignore
similarity index 100%
rename from Code/Tools/cxxtest/sample/parts/.cvsignore
rename to Code/Mantid/TestingTools/cxxtest/sample/parts/.cvsignore
diff --git a/Code/Tools/cxxtest/sample/parts/Makefile.unix b/Code/Mantid/TestingTools/cxxtest/sample/parts/Makefile.unix
similarity index 100%
rename from Code/Tools/cxxtest/sample/parts/Makefile.unix
rename to Code/Mantid/TestingTools/cxxtest/sample/parts/Makefile.unix
diff --git a/Code/Tools/cxxtest/sample/winddk/Makefile b/Code/Mantid/TestingTools/cxxtest/sample/winddk/Makefile
similarity index 100%
rename from Code/Tools/cxxtest/sample/winddk/Makefile
rename to Code/Mantid/TestingTools/cxxtest/sample/winddk/Makefile
diff --git a/Code/Tools/cxxtest/sample/winddk/Makefile.inc b/Code/Mantid/TestingTools/cxxtest/sample/winddk/Makefile.inc
similarity index 100%
rename from Code/Tools/cxxtest/sample/winddk/Makefile.inc
rename to Code/Mantid/TestingTools/cxxtest/sample/winddk/Makefile.inc
diff --git a/Code/Tools/cxxtest/sample/winddk/RunTests.tpl b/Code/Mantid/TestingTools/cxxtest/sample/winddk/RunTests.tpl
similarity index 100%
rename from Code/Tools/cxxtest/sample/winddk/RunTests.tpl
rename to Code/Mantid/TestingTools/cxxtest/sample/winddk/RunTests.tpl
diff --git a/Code/Tools/cxxtest/sample/winddk/SOURCES b/Code/Mantid/TestingTools/cxxtest/sample/winddk/SOURCES
similarity index 100%
rename from Code/Tools/cxxtest/sample/winddk/SOURCES
rename to Code/Mantid/TestingTools/cxxtest/sample/winddk/SOURCES
diff --git a/Code/Tools/cxxtest/sample/yes_no_runner.cpp b/Code/Mantid/TestingTools/cxxtest/sample/yes_no_runner.cpp
similarity index 100%
rename from Code/Tools/cxxtest/sample/yes_no_runner.cpp
rename to Code/Mantid/TestingTools/cxxtest/sample/yes_no_runner.cpp
diff --git a/Code/Tools/cxxtest/test/.cvsignore b/Code/Mantid/TestingTools/cxxtest/test/.cvsignore
similarity index 100%
rename from Code/Tools/cxxtest/test/.cvsignore
rename to Code/Mantid/TestingTools/cxxtest/test/.cvsignore
diff --git a/Code/Tools/cxxtest/test/AborterNoThrow.h b/Code/Mantid/TestingTools/cxxtest/test/AborterNoThrow.h
similarity index 100%
rename from Code/Tools/cxxtest/test/AborterNoThrow.h
rename to Code/Mantid/TestingTools/cxxtest/test/AborterNoThrow.h
diff --git a/Code/Tools/cxxtest/test/BadTest.h b/Code/Mantid/TestingTools/cxxtest/test/BadTest.h
similarity index 100%
rename from Code/Tools/cxxtest/test/BadTest.h
rename to Code/Mantid/TestingTools/cxxtest/test/BadTest.h
diff --git a/Code/Tools/cxxtest/test/Comments.h b/Code/Mantid/TestingTools/cxxtest/test/Comments.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Comments.h
rename to Code/Mantid/TestingTools/cxxtest/test/Comments.h
diff --git a/Code/Tools/cxxtest/test/DeepAbort.h b/Code/Mantid/TestingTools/cxxtest/test/DeepAbort.h
similarity index 100%
rename from Code/Tools/cxxtest/test/DeepAbort.h
rename to Code/Mantid/TestingTools/cxxtest/test/DeepAbort.h
diff --git a/Code/Tools/cxxtest/test/DefaultAbort.h b/Code/Mantid/TestingTools/cxxtest/test/DefaultAbort.h
similarity index 100%
rename from Code/Tools/cxxtest/test/DefaultAbort.h
rename to Code/Mantid/TestingTools/cxxtest/test/DefaultAbort.h
diff --git a/Code/Tools/cxxtest/test/DefaultTraits.h b/Code/Mantid/TestingTools/cxxtest/test/DefaultTraits.h
similarity index 100%
rename from Code/Tools/cxxtest/test/DefaultTraits.h
rename to Code/Mantid/TestingTools/cxxtest/test/DefaultTraits.h
diff --git a/Code/Tools/cxxtest/test/DoubleCall.h b/Code/Mantid/TestingTools/cxxtest/test/DoubleCall.h
similarity index 100%
rename from Code/Tools/cxxtest/test/DoubleCall.h
rename to Code/Mantid/TestingTools/cxxtest/test/DoubleCall.h
diff --git a/Code/Tools/cxxtest/test/DynamicAbort.h b/Code/Mantid/TestingTools/cxxtest/test/DynamicAbort.h
similarity index 100%
rename from Code/Tools/cxxtest/test/DynamicAbort.h
rename to Code/Mantid/TestingTools/cxxtest/test/DynamicAbort.h
diff --git a/Code/Tools/cxxtest/test/DynamicMax.h b/Code/Mantid/TestingTools/cxxtest/test/DynamicMax.h
similarity index 100%
rename from Code/Tools/cxxtest/test/DynamicMax.h
rename to Code/Mantid/TestingTools/cxxtest/test/DynamicMax.h
diff --git a/Code/Tools/cxxtest/test/EmptySuite.h b/Code/Mantid/TestingTools/cxxtest/test/EmptySuite.h
similarity index 100%
rename from Code/Tools/cxxtest/test/EmptySuite.h
rename to Code/Mantid/TestingTools/cxxtest/test/EmptySuite.h
diff --git a/Code/Tools/cxxtest/test/Exceptions.h b/Code/Mantid/TestingTools/cxxtest/test/Exceptions.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Exceptions.h
rename to Code/Mantid/TestingTools/cxxtest/test/Exceptions.h
diff --git a/Code/Tools/cxxtest/test/Factor.h b/Code/Mantid/TestingTools/cxxtest/test/Factor.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Factor.h
rename to Code/Mantid/TestingTools/cxxtest/test/Factor.h
diff --git a/Code/Tools/cxxtest/test/ForceNoEh.h b/Code/Mantid/TestingTools/cxxtest/test/ForceNoEh.h
similarity index 100%
rename from Code/Tools/cxxtest/test/ForceNoEh.h
rename to Code/Mantid/TestingTools/cxxtest/test/ForceNoEh.h
diff --git a/Code/Tools/cxxtest/test/GfSetUpFails.h b/Code/Mantid/TestingTools/cxxtest/test/GfSetUpFails.h
similarity index 100%
rename from Code/Tools/cxxtest/test/GfSetUpFails.h
rename to Code/Mantid/TestingTools/cxxtest/test/GfSetUpFails.h
diff --git a/Code/Tools/cxxtest/test/GfSetUpThrows.h b/Code/Mantid/TestingTools/cxxtest/test/GfSetUpThrows.h
similarity index 100%
rename from Code/Tools/cxxtest/test/GfSetUpThrows.h
rename to Code/Mantid/TestingTools/cxxtest/test/GfSetUpThrows.h
diff --git a/Code/Tools/cxxtest/test/GfTearDownFails.h b/Code/Mantid/TestingTools/cxxtest/test/GfTearDownFails.h
similarity index 100%
rename from Code/Tools/cxxtest/test/GfTearDownFails.h
rename to Code/Mantid/TestingTools/cxxtest/test/GfTearDownFails.h
diff --git a/Code/Tools/cxxtest/test/GfTearDownThrows.h b/Code/Mantid/TestingTools/cxxtest/test/GfTearDownThrows.h
similarity index 100%
rename from Code/Tools/cxxtest/test/GfTearDownThrows.h
rename to Code/Mantid/TestingTools/cxxtest/test/GfTearDownThrows.h
diff --git a/Code/Tools/cxxtest/test/GlobalFixtures.h b/Code/Mantid/TestingTools/cxxtest/test/GlobalFixtures.h
similarity index 100%
rename from Code/Tools/cxxtest/test/GlobalFixtures.h
rename to Code/Mantid/TestingTools/cxxtest/test/GlobalFixtures.h
diff --git a/Code/Tools/cxxtest/test/GoodSuite.h b/Code/Mantid/TestingTools/cxxtest/test/GoodSuite.h
similarity index 100%
rename from Code/Tools/cxxtest/test/GoodSuite.h
rename to Code/Mantid/TestingTools/cxxtest/test/GoodSuite.h
diff --git a/Code/Tools/cxxtest/test/GuiWait.h b/Code/Mantid/TestingTools/cxxtest/test/GuiWait.h
similarity index 100%
rename from Code/Tools/cxxtest/test/GuiWait.h
rename to Code/Mantid/TestingTools/cxxtest/test/GuiWait.h
diff --git a/Code/Tools/cxxtest/test/HaveStd.h b/Code/Mantid/TestingTools/cxxtest/test/HaveStd.h
similarity index 100%
rename from Code/Tools/cxxtest/test/HaveStd.h
rename to Code/Mantid/TestingTools/cxxtest/test/HaveStd.h
diff --git a/Code/Tools/cxxtest/test/IncludeTest.h b/Code/Mantid/TestingTools/cxxtest/test/IncludeTest.h
similarity index 100%
rename from Code/Tools/cxxtest/test/IncludeTest.h
rename to Code/Mantid/TestingTools/cxxtest/test/IncludeTest.h
diff --git a/Code/Tools/cxxtest/test/Int64.h b/Code/Mantid/TestingTools/cxxtest/test/Int64.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Int64.h
rename to Code/Mantid/TestingTools/cxxtest/test/Int64.h
diff --git a/Code/Tools/cxxtest/test/LessThanEquals.h b/Code/Mantid/TestingTools/cxxtest/test/LessThanEquals.h
similarity index 100%
rename from Code/Tools/cxxtest/test/LessThanEquals.h
rename to Code/Mantid/TestingTools/cxxtest/test/LessThanEquals.h
diff --git a/Code/Tools/cxxtest/test/LongLong.h b/Code/Mantid/TestingTools/cxxtest/test/LongLong.h
similarity index 100%
rename from Code/Tools/cxxtest/test/LongLong.h
rename to Code/Mantid/TestingTools/cxxtest/test/LongLong.h
diff --git a/Code/Tools/cxxtest/test/LongTraits.h b/Code/Mantid/TestingTools/cxxtest/test/LongTraits.h
similarity index 100%
rename from Code/Tools/cxxtest/test/LongTraits.h
rename to Code/Mantid/TestingTools/cxxtest/test/LongTraits.h
diff --git a/Code/Tools/cxxtest/test/Makefile b/Code/Mantid/TestingTools/cxxtest/test/Makefile
similarity index 100%
rename from Code/Tools/cxxtest/test/Makefile
rename to Code/Mantid/TestingTools/cxxtest/test/Makefile
diff --git a/Code/Tools/cxxtest/test/MaxDump.h b/Code/Mantid/TestingTools/cxxtest/test/MaxDump.h
similarity index 100%
rename from Code/Tools/cxxtest/test/MaxDump.h
rename to Code/Mantid/TestingTools/cxxtest/test/MaxDump.h
diff --git a/Code/Tools/cxxtest/test/MockTest.h b/Code/Mantid/TestingTools/cxxtest/test/MockTest.h
similarity index 100%
rename from Code/Tools/cxxtest/test/MockTest.h
rename to Code/Mantid/TestingTools/cxxtest/test/MockTest.h
diff --git a/Code/Tools/cxxtest/test/NoEh.h b/Code/Mantid/TestingTools/cxxtest/test/NoEh.h
similarity index 100%
rename from Code/Tools/cxxtest/test/NoEh.h
rename to Code/Mantid/TestingTools/cxxtest/test/NoEh.h
diff --git a/Code/Tools/cxxtest/test/Part1.h b/Code/Mantid/TestingTools/cxxtest/test/Part1.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Part1.h
rename to Code/Mantid/TestingTools/cxxtest/test/Part1.h
diff --git a/Code/Tools/cxxtest/test/Part2.h b/Code/Mantid/TestingTools/cxxtest/test/Part2.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Part2.h
rename to Code/Mantid/TestingTools/cxxtest/test/Part2.h
diff --git a/Code/Tools/cxxtest/test/Relation.h b/Code/Mantid/TestingTools/cxxtest/test/Relation.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Relation.h
rename to Code/Mantid/TestingTools/cxxtest/test/Relation.h
diff --git a/Code/Tools/cxxtest/test/SameData.h b/Code/Mantid/TestingTools/cxxtest/test/SameData.h
similarity index 100%
rename from Code/Tools/cxxtest/test/SameData.h
rename to Code/Mantid/TestingTools/cxxtest/test/SameData.h
diff --git a/Code/Tools/cxxtest/test/SameZero.h b/Code/Mantid/TestingTools/cxxtest/test/SameZero.h
similarity index 100%
rename from Code/Tools/cxxtest/test/SameZero.h
rename to Code/Mantid/TestingTools/cxxtest/test/SameZero.h
diff --git a/Code/Tools/cxxtest/test/SetUpWorldFails.h b/Code/Mantid/TestingTools/cxxtest/test/SetUpWorldFails.h
similarity index 100%
rename from Code/Tools/cxxtest/test/SetUpWorldFails.h
rename to Code/Mantid/TestingTools/cxxtest/test/SetUpWorldFails.h
diff --git a/Code/Tools/cxxtest/test/SetUpWorldThrows.h b/Code/Mantid/TestingTools/cxxtest/test/SetUpWorldThrows.h
similarity index 100%
rename from Code/Tools/cxxtest/test/SetUpWorldThrows.h
rename to Code/Mantid/TestingTools/cxxtest/test/SetUpWorldThrows.h
diff --git a/Code/Tools/cxxtest/test/Something.h b/Code/Mantid/TestingTools/cxxtest/test/Something.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Something.h
rename to Code/Mantid/TestingTools/cxxtest/test/Something.h
diff --git a/Code/Tools/cxxtest/test/StlTraits.h b/Code/Mantid/TestingTools/cxxtest/test/StlTraits.h
similarity index 100%
rename from Code/Tools/cxxtest/test/StlTraits.h
rename to Code/Mantid/TestingTools/cxxtest/test/StlTraits.h
diff --git a/Code/Tools/cxxtest/test/TearDownWorldFails.h b/Code/Mantid/TestingTools/cxxtest/test/TearDownWorldFails.h
similarity index 100%
rename from Code/Tools/cxxtest/test/TearDownWorldFails.h
rename to Code/Mantid/TestingTools/cxxtest/test/TearDownWorldFails.h
diff --git a/Code/Tools/cxxtest/test/TearDownWorldThrows.h b/Code/Mantid/TestingTools/cxxtest/test/TearDownWorldThrows.h
similarity index 100%
rename from Code/Tools/cxxtest/test/TearDownWorldThrows.h
rename to Code/Mantid/TestingTools/cxxtest/test/TearDownWorldThrows.h
diff --git a/Code/Tools/cxxtest/test/ThrowNoStd.h b/Code/Mantid/TestingTools/cxxtest/test/ThrowNoStd.h
similarity index 100%
rename from Code/Tools/cxxtest/test/ThrowNoStd.h
rename to Code/Mantid/TestingTools/cxxtest/test/ThrowNoStd.h
diff --git a/Code/Tools/cxxtest/test/ThrowNoStd.tpl b/Code/Mantid/TestingTools/cxxtest/test/ThrowNoStd.tpl
similarity index 100%
rename from Code/Tools/cxxtest/test/ThrowNoStd.tpl
rename to Code/Mantid/TestingTools/cxxtest/test/ThrowNoStd.tpl
diff --git a/Code/Tools/cxxtest/test/ThrowsAssert.h b/Code/Mantid/TestingTools/cxxtest/test/ThrowsAssert.h
similarity index 100%
rename from Code/Tools/cxxtest/test/ThrowsAssert.h
rename to Code/Mantid/TestingTools/cxxtest/test/ThrowsAssert.h
diff --git a/Code/Tools/cxxtest/test/TraitsTest.h b/Code/Mantid/TestingTools/cxxtest/test/TraitsTest.h
similarity index 100%
rename from Code/Tools/cxxtest/test/TraitsTest.h
rename to Code/Mantid/TestingTools/cxxtest/test/TraitsTest.h
diff --git a/Code/Tools/cxxtest/test/Tsm.h b/Code/Mantid/TestingTools/cxxtest/test/Tsm.h
similarity index 100%
rename from Code/Tools/cxxtest/test/Tsm.h
rename to Code/Mantid/TestingTools/cxxtest/test/Tsm.h
diff --git a/Code/Tools/cxxtest/test/UserTraits.h b/Code/Mantid/TestingTools/cxxtest/test/UserTraits.h
similarity index 100%
rename from Code/Tools/cxxtest/test/UserTraits.h
rename to Code/Mantid/TestingTools/cxxtest/test/UserTraits.h
diff --git a/Code/Tools/cxxtest/test/UserTraits.tpl b/Code/Mantid/TestingTools/cxxtest/test/UserTraits.tpl
similarity index 100%
rename from Code/Tools/cxxtest/test/UserTraits.tpl
rename to Code/Mantid/TestingTools/cxxtest/test/UserTraits.tpl
diff --git a/Code/Tools/cxxtest/test/VoidTraits.h b/Code/Mantid/TestingTools/cxxtest/test/VoidTraits.h
similarity index 100%
rename from Code/Tools/cxxtest/test/VoidTraits.h
rename to Code/Mantid/TestingTools/cxxtest/test/VoidTraits.h
diff --git a/Code/Tools/cxxtest/test/WideCharTest.h b/Code/Mantid/TestingTools/cxxtest/test/WideCharTest.h
similarity index 100%
rename from Code/Tools/cxxtest/test/WideCharTest.h
rename to Code/Mantid/TestingTools/cxxtest/test/WideCharTest.h
diff --git a/Code/Tools/cxxtest/test/WorldFixtures.h b/Code/Mantid/TestingTools/cxxtest/test/WorldFixtures.h
similarity index 100%
rename from Code/Tools/cxxtest/test/WorldFixtures.h
rename to Code/Mantid/TestingTools/cxxtest/test/WorldFixtures.h
diff --git a/Code/Tools/cxxtest/test/abort.out b/Code/Mantid/TestingTools/cxxtest/test/abort.out
similarity index 100%
rename from Code/Tools/cxxtest/test/abort.out
rename to Code/Mantid/TestingTools/cxxtest/test/abort.out
diff --git a/Code/Tools/cxxtest/test/activate.tpl b/Code/Mantid/TestingTools/cxxtest/test/activate.tpl
similarity index 100%
rename from Code/Tools/cxxtest/test/activate.tpl
rename to Code/Mantid/TestingTools/cxxtest/test/activate.tpl
diff --git a/Code/Tools/cxxtest/test/anything.cpp b/Code/Mantid/TestingTools/cxxtest/test/anything.cpp
similarity index 100%
rename from Code/Tools/cxxtest/test/anything.cpp
rename to Code/Mantid/TestingTools/cxxtest/test/anything.cpp
diff --git a/Code/Tools/cxxtest/test/comments.out b/Code/Mantid/TestingTools/cxxtest/test/comments.out
similarity index 100%
rename from Code/Tools/cxxtest/test/comments.out
rename to Code/Mantid/TestingTools/cxxtest/test/comments.out
diff --git a/Code/Tools/cxxtest/test/cxxtest/DummyGui.h b/Code/Mantid/TestingTools/cxxtest/test/cxxtest/DummyGui.h
similarity index 100%
rename from Code/Tools/cxxtest/test/cxxtest/DummyGui.h
rename to Code/Mantid/TestingTools/cxxtest/test/cxxtest/DummyGui.h
diff --git a/Code/Tools/cxxtest/test/default_abort.out b/Code/Mantid/TestingTools/cxxtest/test/default_abort.out
similarity index 100%
rename from Code/Tools/cxxtest/test/default_abort.out
rename to Code/Mantid/TestingTools/cxxtest/test/default_abort.out
diff --git a/Code/Tools/cxxtest/test/eh_normals.out b/Code/Mantid/TestingTools/cxxtest/test/eh_normals.out
similarity index 100%
rename from Code/Tools/cxxtest/test/eh_normals.out
rename to Code/Mantid/TestingTools/cxxtest/test/eh_normals.out
diff --git a/Code/Tools/cxxtest/test/error.out b/Code/Mantid/TestingTools/cxxtest/test/error.out
similarity index 100%
rename from Code/Tools/cxxtest/test/error.out
rename to Code/Mantid/TestingTools/cxxtest/test/error.out
diff --git a/Code/Tools/cxxtest/test/factor.out b/Code/Mantid/TestingTools/cxxtest/test/factor.out
similarity index 100%
rename from Code/Tools/cxxtest/test/factor.out
rename to Code/Mantid/TestingTools/cxxtest/test/factor.out
diff --git a/Code/Tools/cxxtest/test/fake/.cvsignore b/Code/Mantid/TestingTools/cxxtest/test/fake/.cvsignore
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/.cvsignore
rename to Code/Mantid/TestingTools/cxxtest/test/fake/.cvsignore
diff --git a/Code/Tools/cxxtest/test/fake/X11/Xlib.h b/Code/Mantid/TestingTools/cxxtest/test/fake/X11/Xlib.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/X11/Xlib.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/X11/Xlib.h
diff --git a/Code/Tools/cxxtest/test/fake/X11/Xutil.h b/Code/Mantid/TestingTools/cxxtest/test/fake/X11/Xutil.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/X11/Xutil.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/X11/Xutil.h
diff --git a/Code/Tools/cxxtest/test/fake/commctrl.h b/Code/Mantid/TestingTools/cxxtest/test/fake/commctrl.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/commctrl.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/commctrl.h
diff --git a/Code/Tools/cxxtest/test/fake/qapplication.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qapplication.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qapplication.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qapplication.h
diff --git a/Code/Tools/cxxtest/test/fake/qglobal.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qglobal.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qglobal.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qglobal.h
diff --git a/Code/Tools/cxxtest/test/fake/qlabel.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qlabel.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qlabel.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qlabel.h
diff --git a/Code/Tools/cxxtest/test/fake/qlayout.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qlayout.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qlayout.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qlayout.h
diff --git a/Code/Tools/cxxtest/test/fake/qmessagebox.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qmessagebox.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qmessagebox.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qmessagebox.h
diff --git a/Code/Tools/cxxtest/test/fake/qpixmap.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qpixmap.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qpixmap.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qpixmap.h
diff --git a/Code/Tools/cxxtest/test/fake/qprogressbar.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qprogressbar.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qprogressbar.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qprogressbar.h
diff --git a/Code/Tools/cxxtest/test/fake/qstatusbar.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qstatusbar.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qstatusbar.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qstatusbar.h
diff --git a/Code/Tools/cxxtest/test/fake/qstring.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qstring.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qstring.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qstring.h
diff --git a/Code/Tools/cxxtest/test/fake/qwidget.h b/Code/Mantid/TestingTools/cxxtest/test/fake/qwidget.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/qwidget.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/qwidget.h
diff --git a/Code/Tools/cxxtest/test/fake/windows.h b/Code/Mantid/TestingTools/cxxtest/test/fake/windows.h
similarity index 100%
rename from Code/Tools/cxxtest/test/fake/windows.h
rename to Code/Mantid/TestingTools/cxxtest/test/fake/windows.h
diff --git a/Code/Tools/cxxtest/test/gfsuf.out b/Code/Mantid/TestingTools/cxxtest/test/gfsuf.out
similarity index 100%
rename from Code/Tools/cxxtest/test/gfsuf.out
rename to Code/Mantid/TestingTools/cxxtest/test/gfsuf.out
diff --git a/Code/Tools/cxxtest/test/gfsut.out b/Code/Mantid/TestingTools/cxxtest/test/gfsut.out
similarity index 100%
rename from Code/Tools/cxxtest/test/gfsut.out
rename to Code/Mantid/TestingTools/cxxtest/test/gfsut.out
diff --git a/Code/Tools/cxxtest/test/gftdf.out b/Code/Mantid/TestingTools/cxxtest/test/gftdf.out
similarity index 100%
rename from Code/Tools/cxxtest/test/gftdf.out
rename to Code/Mantid/TestingTools/cxxtest/test/gftdf.out
diff --git a/Code/Tools/cxxtest/test/gftdt.out b/Code/Mantid/TestingTools/cxxtest/test/gftdt.out
similarity index 100%
rename from Code/Tools/cxxtest/test/gftdt.out
rename to Code/Mantid/TestingTools/cxxtest/test/gftdt.out
diff --git a/Code/Tools/cxxtest/test/gfxs.out b/Code/Mantid/TestingTools/cxxtest/test/gfxs.out
similarity index 100%
rename from Code/Tools/cxxtest/test/gfxs.out
rename to Code/Mantid/TestingTools/cxxtest/test/gfxs.out
diff --git a/Code/Tools/cxxtest/test/good.out b/Code/Mantid/TestingTools/cxxtest/test/good.out
similarity index 100%
rename from Code/Tools/cxxtest/test/good.out
rename to Code/Mantid/TestingTools/cxxtest/test/good.out
diff --git a/Code/Tools/cxxtest/test/gui.out b/Code/Mantid/TestingTools/cxxtest/test/gui.out
similarity index 100%
rename from Code/Tools/cxxtest/test/gui.out
rename to Code/Mantid/TestingTools/cxxtest/test/gui.out
diff --git a/Code/Tools/cxxtest/test/gui_paren.out b/Code/Mantid/TestingTools/cxxtest/test/gui_paren.out
similarity index 100%
rename from Code/Tools/cxxtest/test/gui_paren.out
rename to Code/Mantid/TestingTools/cxxtest/test/gui_paren.out
diff --git a/Code/Tools/cxxtest/test/include.out b/Code/Mantid/TestingTools/cxxtest/test/include.out
similarity index 100%
rename from Code/Tools/cxxtest/test/include.out
rename to Code/Mantid/TestingTools/cxxtest/test/include.out
diff --git a/Code/Tools/cxxtest/test/int64.cpp b/Code/Mantid/TestingTools/cxxtest/test/int64.cpp
similarity index 100%
rename from Code/Tools/cxxtest/test/int64.cpp
rename to Code/Mantid/TestingTools/cxxtest/test/int64.cpp
diff --git a/Code/Tools/cxxtest/test/int64.out b/Code/Mantid/TestingTools/cxxtest/test/int64.out
similarity index 100%
rename from Code/Tools/cxxtest/test/int64.out
rename to Code/Mantid/TestingTools/cxxtest/test/int64.out
diff --git a/Code/Tools/cxxtest/test/longlong.cpp b/Code/Mantid/TestingTools/cxxtest/test/longlong.cpp
similarity index 100%
rename from Code/Tools/cxxtest/test/longlong.cpp
rename to Code/Mantid/TestingTools/cxxtest/test/longlong.cpp
diff --git a/Code/Tools/cxxtest/test/longlong.out b/Code/Mantid/TestingTools/cxxtest/test/longlong.out
similarity index 100%
rename from Code/Tools/cxxtest/test/longlong.out
rename to Code/Mantid/TestingTools/cxxtest/test/longlong.out
diff --git a/Code/Tools/cxxtest/test/main.cpp b/Code/Mantid/TestingTools/cxxtest/test/main.cpp
similarity index 100%
rename from Code/Tools/cxxtest/test/main.cpp
rename to Code/Mantid/TestingTools/cxxtest/test/main.cpp
diff --git a/Code/Tools/cxxtest/test/max.out b/Code/Mantid/TestingTools/cxxtest/test/max.out
similarity index 100%
rename from Code/Tools/cxxtest/test/max.out
rename to Code/Mantid/TestingTools/cxxtest/test/max.out
diff --git a/Code/Tools/cxxtest/test/normal.out b/Code/Mantid/TestingTools/cxxtest/test/normal.out
similarity index 100%
rename from Code/Tools/cxxtest/test/normal.out
rename to Code/Mantid/TestingTools/cxxtest/test/normal.out
diff --git a/Code/Tools/cxxtest/test/paren.out b/Code/Mantid/TestingTools/cxxtest/test/paren.out
similarity index 100%
rename from Code/Tools/cxxtest/test/paren.out
rename to Code/Mantid/TestingTools/cxxtest/test/paren.out
diff --git a/Code/Tools/cxxtest/test/parts.out b/Code/Mantid/TestingTools/cxxtest/test/parts.out
similarity index 100%
rename from Code/Tools/cxxtest/test/parts.out
rename to Code/Mantid/TestingTools/cxxtest/test/parts.out
diff --git a/Code/Tools/cxxtest/test/preamble.out b/Code/Mantid/TestingTools/cxxtest/test/preamble.out
similarity index 100%
rename from Code/Tools/cxxtest/test/preamble.out
rename to Code/Mantid/TestingTools/cxxtest/test/preamble.out
diff --git a/Code/Tools/cxxtest/test/preamble.tpl b/Code/Mantid/TestingTools/cxxtest/test/preamble.tpl
similarity index 100%
rename from Code/Tools/cxxtest/test/preamble.tpl
rename to Code/Mantid/TestingTools/cxxtest/test/preamble.tpl
diff --git a/Code/Tools/cxxtest/test/runner.out b/Code/Mantid/TestingTools/cxxtest/test/runner.out
similarity index 100%
rename from Code/Tools/cxxtest/test/runner.out
rename to Code/Mantid/TestingTools/cxxtest/test/runner.out
diff --git a/Code/Tools/cxxtest/test/std.out b/Code/Mantid/TestingTools/cxxtest/test/std.out
similarity index 100%
rename from Code/Tools/cxxtest/test/std.out
rename to Code/Mantid/TestingTools/cxxtest/test/std.out
diff --git a/Code/Tools/cxxtest/test/stl.out b/Code/Mantid/TestingTools/cxxtest/test/stl.out
similarity index 100%
rename from Code/Tools/cxxtest/test/stl.out
rename to Code/Mantid/TestingTools/cxxtest/test/stl.out
diff --git a/Code/Tools/cxxtest/test/stpltpl.cpp b/Code/Mantid/TestingTools/cxxtest/test/stpltpl.cpp
similarity index 100%
rename from Code/Tools/cxxtest/test/stpltpl.cpp
rename to Code/Mantid/TestingTools/cxxtest/test/stpltpl.cpp
diff --git a/Code/Tools/cxxtest/test/suite.out b/Code/Mantid/TestingTools/cxxtest/test/suite.out
similarity index 100%
rename from Code/Tools/cxxtest/test/suite.out
rename to Code/Mantid/TestingTools/cxxtest/test/suite.out
diff --git a/Code/Tools/cxxtest/test/suite_test.out b/Code/Mantid/TestingTools/cxxtest/test/suite_test.out
similarity index 100%
rename from Code/Tools/cxxtest/test/suite_test.out
rename to Code/Mantid/TestingTools/cxxtest/test/suite_test.out
diff --git a/Code/Tools/cxxtest/test/suwf.out b/Code/Mantid/TestingTools/cxxtest/test/suwf.out
similarity index 100%
rename from Code/Tools/cxxtest/test/suwf.out
rename to Code/Mantid/TestingTools/cxxtest/test/suwf.out
diff --git a/Code/Tools/cxxtest/test/suwt.out b/Code/Mantid/TestingTools/cxxtest/test/suwt.out
similarity index 100%
rename from Code/Tools/cxxtest/test/suwt.out
rename to Code/Mantid/TestingTools/cxxtest/test/suwt.out
diff --git a/Code/Tools/cxxtest/test/tdwf.out b/Code/Mantid/TestingTools/cxxtest/test/tdwf.out
similarity index 100%
rename from Code/Tools/cxxtest/test/tdwf.out
rename to Code/Mantid/TestingTools/cxxtest/test/tdwf.out
diff --git a/Code/Tools/cxxtest/test/tdwt.out b/Code/Mantid/TestingTools/cxxtest/test/tdwt.out
similarity index 100%
rename from Code/Tools/cxxtest/test/tdwt.out
rename to Code/Mantid/TestingTools/cxxtest/test/tdwt.out
diff --git a/Code/Tools/cxxtest/test/test.pl b/Code/Mantid/TestingTools/cxxtest/test/test.pl
similarity index 100%
rename from Code/Tools/cxxtest/test/test.pl
rename to Code/Mantid/TestingTools/cxxtest/test/test.pl
diff --git a/Code/Tools/cxxtest/test/throw.out b/Code/Mantid/TestingTools/cxxtest/test/throw.out
similarity index 100%
rename from Code/Tools/cxxtest/test/throw.out
rename to Code/Mantid/TestingTools/cxxtest/test/throw.out
diff --git a/Code/Tools/cxxtest/test/tpltpl.cpp b/Code/Mantid/TestingTools/cxxtest/test/tpltpl.cpp
similarity index 100%
rename from Code/Tools/cxxtest/test/tpltpl.cpp
rename to Code/Mantid/TestingTools/cxxtest/test/tpltpl.cpp
diff --git a/Code/Tools/cxxtest/test/unit/LinkedList_test.t.h b/Code/Mantid/TestingTools/cxxtest/test/unit/LinkedList_test.t.h
similarity index 100%
rename from Code/Tools/cxxtest/test/unit/LinkedList_test.t.h
rename to Code/Mantid/TestingTools/cxxtest/test/unit/LinkedList_test.t.h
diff --git a/Code/Tools/cxxtest/test/unit/SConstruct b/Code/Mantid/TestingTools/cxxtest/test/unit/SConstruct
similarity index 100%
rename from Code/Tools/cxxtest/test/unit/SConstruct
rename to Code/Mantid/TestingTools/cxxtest/test/unit/SConstruct
diff --git a/Code/Tools/cxxtest/test/user.out b/Code/Mantid/TestingTools/cxxtest/test/user.out
similarity index 100%
rename from Code/Tools/cxxtest/test/user.out
rename to Code/Mantid/TestingTools/cxxtest/test/user.out
diff --git a/Code/Tools/cxxtest/test/wchar.cpp b/Code/Mantid/TestingTools/cxxtest/test/wchar.cpp
similarity index 100%
rename from Code/Tools/cxxtest/test/wchar.cpp
rename to Code/Mantid/TestingTools/cxxtest/test/wchar.cpp
diff --git a/Code/Tools/cxxtest/test/wchar.out b/Code/Mantid/TestingTools/cxxtest/test/wchar.out
similarity index 100%
rename from Code/Tools/cxxtest/test/wchar.out
rename to Code/Mantid/TestingTools/cxxtest/test/wchar.out
diff --git a/Code/Tools/cxxtest/test/wildcard.out b/Code/Mantid/TestingTools/cxxtest/test/wildcard.out
similarity index 100%
rename from Code/Tools/cxxtest/test/wildcard.out
rename to Code/Mantid/TestingTools/cxxtest/test/wildcard.out
diff --git a/Code/Tools/cxxtest/www/cn-project-pages/snippets/HtmlSnippet1.html b/Code/Mantid/TestingTools/cxxtest/www/cn-project-pages/snippets/HtmlSnippet1.html
similarity index 100%
rename from Code/Tools/cxxtest/www/cn-project-pages/snippets/HtmlSnippet1.html
rename to Code/Mantid/TestingTools/cxxtest/www/cn-project-pages/snippets/HtmlSnippet1.html
diff --git a/Code/Tools/cxxtest/www/cn-project-pages/snippets/page.xml b/Code/Mantid/TestingTools/cxxtest/www/cn-project-pages/snippets/page.xml
similarity index 100%
rename from Code/Tools/cxxtest/www/cn-project-pages/snippets/page.xml
rename to Code/Mantid/TestingTools/cxxtest/www/cn-project-pages/snippets/page.xml
diff --git a/Code/TestingTools/include/gmock/gmock-actions.h b/Code/Mantid/TestingTools/include/gmock/gmock-actions.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-actions.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-actions.h
diff --git a/Code/TestingTools/include/gmock/gmock-cardinalities.h b/Code/Mantid/TestingTools/include/gmock/gmock-cardinalities.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-cardinalities.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-cardinalities.h
diff --git a/Code/TestingTools/include/gmock/gmock-generated-actions.h b/Code/Mantid/TestingTools/include/gmock/gmock-generated-actions.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-generated-actions.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-generated-actions.h
diff --git a/Code/TestingTools/include/gmock/gmock-generated-actions.h.pump b/Code/Mantid/TestingTools/include/gmock/gmock-generated-actions.h.pump
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-generated-actions.h.pump
rename to Code/Mantid/TestingTools/include/gmock/gmock-generated-actions.h.pump
diff --git a/Code/TestingTools/include/gmock/gmock-generated-function-mockers.h b/Code/Mantid/TestingTools/include/gmock/gmock-generated-function-mockers.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-generated-function-mockers.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-generated-function-mockers.h
diff --git a/Code/TestingTools/include/gmock/gmock-generated-function-mockers.h.pump b/Code/Mantid/TestingTools/include/gmock/gmock-generated-function-mockers.h.pump
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-generated-function-mockers.h.pump
rename to Code/Mantid/TestingTools/include/gmock/gmock-generated-function-mockers.h.pump
diff --git a/Code/TestingTools/include/gmock/gmock-generated-matchers.h b/Code/Mantid/TestingTools/include/gmock/gmock-generated-matchers.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-generated-matchers.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-generated-matchers.h
diff --git a/Code/TestingTools/include/gmock/gmock-generated-matchers.h.pump b/Code/Mantid/TestingTools/include/gmock/gmock-generated-matchers.h.pump
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-generated-matchers.h.pump
rename to Code/Mantid/TestingTools/include/gmock/gmock-generated-matchers.h.pump
diff --git a/Code/TestingTools/include/gmock/gmock-generated-nice-strict.h b/Code/Mantid/TestingTools/include/gmock/gmock-generated-nice-strict.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-generated-nice-strict.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-generated-nice-strict.h
diff --git a/Code/TestingTools/include/gmock/gmock-generated-nice-strict.h.pump b/Code/Mantid/TestingTools/include/gmock/gmock-generated-nice-strict.h.pump
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-generated-nice-strict.h.pump
rename to Code/Mantid/TestingTools/include/gmock/gmock-generated-nice-strict.h.pump
diff --git a/Code/TestingTools/include/gmock/gmock-matchers.h b/Code/Mantid/TestingTools/include/gmock/gmock-matchers.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-matchers.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-matchers.h
diff --git a/Code/TestingTools/include/gmock/gmock-more-actions.h b/Code/Mantid/TestingTools/include/gmock/gmock-more-actions.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-more-actions.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-more-actions.h
diff --git a/Code/TestingTools/include/gmock/gmock-printers.h b/Code/Mantid/TestingTools/include/gmock/gmock-printers.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-printers.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-printers.h
diff --git a/Code/TestingTools/include/gmock/gmock-spec-builders.h b/Code/Mantid/TestingTools/include/gmock/gmock-spec-builders.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock-spec-builders.h
rename to Code/Mantid/TestingTools/include/gmock/gmock-spec-builders.h
diff --git a/Code/TestingTools/include/gmock/gmock.h b/Code/Mantid/TestingTools/include/gmock/gmock.h
similarity index 100%
rename from Code/TestingTools/include/gmock/gmock.h
rename to Code/Mantid/TestingTools/include/gmock/gmock.h
diff --git a/Code/TestingTools/include/gmock/internal/gmock-generated-internal-utils.h b/Code/Mantid/TestingTools/include/gmock/internal/gmock-generated-internal-utils.h
similarity index 100%
rename from Code/TestingTools/include/gmock/internal/gmock-generated-internal-utils.h
rename to Code/Mantid/TestingTools/include/gmock/internal/gmock-generated-internal-utils.h
diff --git a/Code/TestingTools/include/gmock/internal/gmock-generated-internal-utils.h.pump b/Code/Mantid/TestingTools/include/gmock/internal/gmock-generated-internal-utils.h.pump
similarity index 100%
rename from Code/TestingTools/include/gmock/internal/gmock-generated-internal-utils.h.pump
rename to Code/Mantid/TestingTools/include/gmock/internal/gmock-generated-internal-utils.h.pump
diff --git a/Code/TestingTools/include/gmock/internal/gmock-internal-utils.h b/Code/Mantid/TestingTools/include/gmock/internal/gmock-internal-utils.h
similarity index 100%
rename from Code/TestingTools/include/gmock/internal/gmock-internal-utils.h
rename to Code/Mantid/TestingTools/include/gmock/internal/gmock-internal-utils.h
diff --git a/Code/TestingTools/include/gmock/internal/gmock-port.h b/Code/Mantid/TestingTools/include/gmock/internal/gmock-port.h
similarity index 100%
rename from Code/TestingTools/include/gmock/internal/gmock-port.h
rename to Code/Mantid/TestingTools/include/gmock/internal/gmock-port.h
diff --git a/Code/TestingTools/include/gtest/gtest-death-test.h b/Code/Mantid/TestingTools/include/gtest/gtest-death-test.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest-death-test.h
rename to Code/Mantid/TestingTools/include/gtest/gtest-death-test.h
diff --git a/Code/TestingTools/include/gtest/gtest-message.h b/Code/Mantid/TestingTools/include/gtest/gtest-message.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest-message.h
rename to Code/Mantid/TestingTools/include/gtest/gtest-message.h
diff --git a/Code/TestingTools/include/gtest/gtest-param-test.h b/Code/Mantid/TestingTools/include/gtest/gtest-param-test.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest-param-test.h
rename to Code/Mantid/TestingTools/include/gtest/gtest-param-test.h
diff --git a/Code/TestingTools/include/gtest/gtest-param-test.h.pump b/Code/Mantid/TestingTools/include/gtest/gtest-param-test.h.pump
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest-param-test.h.pump
rename to Code/Mantid/TestingTools/include/gtest/gtest-param-test.h.pump
diff --git a/Code/TestingTools/include/gtest/gtest-spi.h b/Code/Mantid/TestingTools/include/gtest/gtest-spi.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest-spi.h
rename to Code/Mantid/TestingTools/include/gtest/gtest-spi.h
diff --git a/Code/TestingTools/include/gtest/gtest-test-part.h b/Code/Mantid/TestingTools/include/gtest/gtest-test-part.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest-test-part.h
rename to Code/Mantid/TestingTools/include/gtest/gtest-test-part.h
diff --git a/Code/TestingTools/include/gtest/gtest-typed-test.h b/Code/Mantid/TestingTools/include/gtest/gtest-typed-test.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest-typed-test.h
rename to Code/Mantid/TestingTools/include/gtest/gtest-typed-test.h
diff --git a/Code/TestingTools/include/gtest/gtest.h b/Code/Mantid/TestingTools/include/gtest/gtest.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest.h
rename to Code/Mantid/TestingTools/include/gtest/gtest.h
diff --git a/Code/TestingTools/include/gtest/gtest_pred_impl.h b/Code/Mantid/TestingTools/include/gtest/gtest_pred_impl.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest_pred_impl.h
rename to Code/Mantid/TestingTools/include/gtest/gtest_pred_impl.h
diff --git a/Code/TestingTools/include/gtest/gtest_prod.h b/Code/Mantid/TestingTools/include/gtest/gtest_prod.h
similarity index 100%
rename from Code/TestingTools/include/gtest/gtest_prod.h
rename to Code/Mantid/TestingTools/include/gtest/gtest_prod.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-death-test-internal.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-death-test-internal.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-death-test-internal.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-death-test-internal.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-filepath.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-filepath.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-filepath.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-filepath.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-internal.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-internal.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-internal.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-internal.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-linked_ptr.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-linked_ptr.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-linked_ptr.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-linked_ptr.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-param-util-generated.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-param-util-generated.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-param-util-generated.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-param-util-generated.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-param-util-generated.h.pump b/Code/Mantid/TestingTools/include/gtest/internal/gtest-param-util-generated.h.pump
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-param-util-generated.h.pump
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-param-util-generated.h.pump
diff --git a/Code/TestingTools/include/gtest/internal/gtest-param-util.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-param-util.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-param-util.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-param-util.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-port.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-port.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-port.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-port.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-string.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-string.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-string.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-string.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-tuple.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-tuple.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-tuple.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-tuple.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-tuple.h.pump b/Code/Mantid/TestingTools/include/gtest/internal/gtest-tuple.h.pump
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-tuple.h.pump
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-tuple.h.pump
diff --git a/Code/TestingTools/include/gtest/internal/gtest-type-util.h b/Code/Mantid/TestingTools/include/gtest/internal/gtest-type-util.h
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-type-util.h
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-type-util.h
diff --git a/Code/TestingTools/include/gtest/internal/gtest-type-util.h.pump b/Code/Mantid/TestingTools/include/gtest/internal/gtest-type-util.h.pump
similarity index 100%
rename from Code/TestingTools/include/gtest/internal/gtest-type-util.h.pump
rename to Code/Mantid/TestingTools/include/gtest/internal/gtest-type-util.h.pump
diff --git a/Code/TestingTools/lib/rhel5/libgmock.a b/Code/Mantid/TestingTools/lib/rhel5/libgmock.a
similarity index 100%
rename from Code/TestingTools/lib/rhel5/libgmock.a
rename to Code/Mantid/TestingTools/lib/rhel5/libgmock.a
diff --git a/Code/TestingTools/lib/ubuntu-10.04/libgmock.a b/Code/Mantid/TestingTools/lib/ubuntu-10.04/libgmock.a
similarity index 100%
rename from Code/TestingTools/lib/ubuntu-10.04/libgmock.a
rename to Code/Mantid/TestingTools/lib/ubuntu-10.04/libgmock.a
diff --git a/Code/TestingTools/lib/ubuntu-10.10/libgmock.a b/Code/Mantid/TestingTools/lib/ubuntu-10.10/libgmock.a
similarity index 100%
rename from Code/TestingTools/lib/ubuntu-10.10/libgmock.a
rename to Code/Mantid/TestingTools/lib/ubuntu-10.10/libgmock.a