diff --git a/.gitignore b/.gitignore
index 1270cd77da6a0ac99337b083f38bf44a63303abd..f1465d440d754281d920abf03851236b21c7042b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,4 +2,7 @@
 *.vvp
 simulate/sim/*
 .socinit
-system/bootrom
\ No newline at end of file
+wrapper/html
+system/bootrom
+system/html
+flist/tmp
\ No newline at end of file
diff --git a/.gitmodules b/.gitmodules
index f08e7c37228092a9c06611fe186f7b0bbf66adf5..4ae9fc23254b0e8632225e7ac2c908958ce8fbe1 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -4,8 +4,8 @@ url = https://git.soton.ac.uk/soclabs/accelerator_wrapper_tech.git
 [submodule "nanosoc_tech"]
 	path = nanosoc_tech
 url = https://git.soton.ac.uk/soclabs/nanosoc_tech.git
-[submodule "socsim_flow"]
-	path = socsim_flow
+[submodule "soctools_flow"]
+	path = soctools_flow
 url = https://git.soton.ac.uk/soclabs/socsim_flow.git
 [submodule "chipkit_flow"]
 	path = chipkit_flow
diff --git a/env/dependency_env.sh b/env/dependency_env.sh
index e68faffe02208c2f71ab0ca34fc9d28df4a2b23d..36c091a619c0da2e09d1d2794fbf8066647393dc 100755
--- a/env/dependency_env.sh
+++ b/env/dependency_env.sh
@@ -39,5 +39,5 @@ export GENERIC_LIB_TECH_DIR="$PROJECT_DIR/generic_lib_tech"
 # CHIPKIT - Register Generation
 export CHIPKIT_FLOW_DIR="$PROJECT_DIR/chipkit_flow"
 
-# SoCSim - Basic Simulation Flow Wrapper
-export SOCSIM_FLOW_DIR="$PROJECT_DIR/socsim_flow"
\ No newline at end of file
+# SoCTools - Toolkit of scripts related to SoCLabs projects
+export SOCTOOLS_FLOW_DIR="$PROJECT_DIR/socsim_flow"
\ No newline at end of file
diff --git a/flow/simulators/ivlog_sim.sh b/flow/simulators/ivlog_sim.sh
deleted file mode 100755
index 839dd425d08e42f84778c8b48f40671161827198..0000000000000000000000000000000000000000
--- a/flow/simulators/ivlog_sim.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#-----------------------------------------------------------------------------
-# SoC Labs icarus verilog simulation script for engine testbench
-# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
-#
-# Contributors
-#
-# David Mapstone (d.a.mapstone@soton.ac.uk)
-#
-# Copyright  2022, SoC Labs (www.soclabs.org)
-#-----------------------------------------------------------------------------
-
-#!/usr/bin/env bash
-
-mkdir -p $PROJECT_DIR/simulate/sim/ 
-iverilog -g2012 -o $PROJECT_DIR/simulate/sim/$1.vvp $WRAPPER_TECH_DIR/hdl/verif/tb_$1.sv
-cd $PROJECT_DIR/simulate/sim/ && vvp $1.vvp $2
\ No newline at end of file
diff --git a/flow/soc-pull b/flow/soc-pull
deleted file mode 100755
index 42ff6515f1c6ed566a464cc2f9cc307878b517f0..0000000000000000000000000000000000000000
--- a/flow/soc-pull
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# Update all Submodules to latest commit
-cd $DESIGN_ROOT; git submodule foreach --recursive git pull
-# for d in $DESIGN_ROOT/* ; do
-#     if [ -f "$d/.git" ]; then
-#         echo "Git Pulling $d"
-#         cd $d; git pull; cd ..
-#     fi
-# done
\ No newline at end of file
diff --git a/flow/socsim b/flow/socsim
deleted file mode 100755
index 4475e853e14786a05a3a6a390671e877a9d2a4d3..0000000000000000000000000000000000000000
--- a/flow/socsim
+++ /dev/null
@@ -1,27 +0,0 @@
-#-----------------------------------------------------------------------------
-# SoC Labs socsim script to run required simulation
-# A joint work commissioned on behalf of SoC Labs, under Arm Academic Access license.
-#
-# Contributors
-#
-# David Mapstone (d.a.mapstone@soton.ac.uk)
-#
-# Copyright  2022, SoC Labs (www.soclabs.org)
-#-----------------------------------------------------------------------------
-
-#!/usr/bin/env bash
-
-DEFAULT_SIMULATOR="ivlog"
-if [[ -z "${SIMULATOR}" ]]; then 
-    SIMULATOR=$DEFAULT_SIMULATOR
-fi
-# $PROJECT_DIR"/flow/simulators/"$SIMULATOR"_sim.sh" $@
-
-for d in $PROJECT_DIR/* ; do
-    if [ -f "$d/.git" ]; then
-        if [ -f "$d/simulate/socsim/$1.sh" ]; then
-        # If .git file exists - submodule
-            bash $d/simulate/socsim/$1.sh
-        fi
-    fi
-done
\ No newline at end of file
diff --git a/generic_lib_tech b/generic_lib_tech
index 69e79bf881a73af0b3ee04e25835450ed2635718..53dca95d66a93333a7e6e8bbbda0696a348da0b5 160000
--- a/generic_lib_tech
+++ b/generic_lib_tech
@@ -1 +1 @@
-Subproject commit 69e79bf881a73af0b3ee04e25835450ed2635718
+Subproject commit 53dca95d66a93333a7e6e8bbbda0696a348da0b5
diff --git a/nanosoc_tech b/nanosoc_tech
index 9e4a4da0a9dd45c84a787c4cf73294e7a412aff4..263c129eee99942b27c5c6199ec91b81c85021c3 160000
--- a/nanosoc_tech
+++ b/nanosoc_tech
@@ -1 +1 @@
-Subproject commit 9e4a4da0a9dd45c84a787c4cf73294e7a412aff4
+Subproject commit 263c129eee99942b27c5c6199ec91b81c85021c3
diff --git a/set_env.sh b/set_env.sh
index f93060c136df0673e310117659e5f612b8904f0c..133b92f1eb4e8160bac46f9b0c440290af816345 100755
--- a/set_env.sh
+++ b/set_env.sh
@@ -30,8 +30,6 @@ else
     if [ $PROJECT_DIR = $DESIGN_ROOT ]; then
         echo "Design Workspace: $DESIGN_ROOT" 
         export DESIGN_ROOT
-        # Set Default Simulator
-        export SIMULATOR="ivlog"
     fi
 
     # Source dependency environment variable script
@@ -45,7 +43,7 @@ else
 
     # "FLOW_DIR"
     while read line; do 
-        eval PATH="$PATH:\$${line}/flow"
+        eval PATH="$PATH:\$${line}/tools"
     done <<< "$(awk 'BEGIN{for(v in ENVIRON) print v}' | grep FLOW_DIR)"
 
     # "PROJECT_DIR"
diff --git a/socsim_flow b/socsim_flow
deleted file mode 160000
index 78e5c225440a1dbac511d22f1dec39fa51702e6d..0000000000000000000000000000000000000000
--- a/socsim_flow
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 78e5c225440a1dbac511d22f1dec39fa51702e6d