diff --git a/README.md b/README.md
index 2a6aad0..c8c7457 100644
--- a/README.md
+++ b/README.md
@@ -4,11 +4,11 @@
 
 ### Executables:
 
-- gentrace-spike.py - reads a Spike trace and reformat it. We expect to support
+- tbm/gentrace-spike.py - reads a Spike trace and reformat it. We expect to support
   other functional simulators, each of those will have its own gentrace-*.py
   file.
-- tbm.py - runs a trace in TBM; the main tool here.
-- merge-counters.py - merges results from multiple runs of TBM.
+- tbm/tbm.py - runs a trace in TBM; the main tool here.
+- tbm/merge-counters.py - merges results from multiple runs of TBM.
 
 ### Python modules:
 
@@ -17,31 +17,31 @@
 uArchs that are not supported by the current models. interfaces.py defines (what
 we expect to be) the API of the building blocks.
 
-- counter.py - performance counters.
-- cpu.py - defines CPU, a cpu model (includes instances of FetchUnit, SchedUnit,
+- tbm/buffered_queue.py - defines Queue, FIFO queue model.
+- tbm/counter.py - performance counters.
+- tbm/cpu.py - defines CPU, a cpu model (includes instances of FetchUnit, SchedUnit,
   ExecUnit, and MemorySystem).
-- disassembler.py - bits we need to elaborate Spike traces.
-- exec_unit.py - defines ExecUnit, an execution unit model (includes instances of
+- tbm/disassembler.py - bits we need to elaborate Spike traces.
+- tbm/exec_unit.py - defines ExecUnit, an execution unit model (includes instances of
   ScalarPipe, VectorPipe, scoreboard.Preemptive and scoreboard.VecPreemptive).
-- fetch_unit.py - defines FetchUnit.
-- instruction.fbs - FlatBuffer schema for the Instruction data class (used for
+- tbm/fetch_unit.py - defines FetchUnit.
+- tbm/functional_trace.py - reads a trace (as generated by gentrace-*.py).
+- tbm/instruction.fbs - FlatBuffer schema for the Instruction data class (used for
   saving elaborated traces). The FBInstruction.Instruction module is generated
   from this file.
-- instruction.py - defines Instruction, a data class representing a single
+- tbm/instruction.py - defines Instruction, a data class representing a single
   instruction instance in the trace.
-- interfaces.py - defines the internal API. This will be more important when we
+- tbm/interfaces.py - defines the internal API. This will be more important when we
   add different models (i.e. implementations) for the various units.
-- memory_system.py - defines MemorySystem, a main memory and cache hierarchy model.
-- queue.py - defines Queue, FIFO queue model.
-- scalar_pipe.py - defines ScalarPipe, a scalar functional unit model.
-- sched_unit.py - defines SchedUnit, an issue queue model.
-- scoreboard.py - defines Preemptive and VecPreemptive, scoreboard models.
-- tbm_options.py - command line parsing for tbm.py.
-- trace.py - reads a trace (as generated by gentrace-*.py).
-- utilities.py - general purpose constructs.
-- vector_pipe.py - defines VectorPipe, a vector functional unit model.
+- tbm/memory_system.py - defines MemorySystem, a main memory and cache hierarchy model.
+- tbm/scalar_pipe.py - defines ScalarPipe, a scalar functional unit model.
+- tbm/sched_unit.py - defines SchedUnit, an issue queue model.
+- tbm/scoreboard.py - defines Preemptive and VecPreemptive, scoreboard models.
+- tbm/tbm_options.py - command line parsing for tbm.py.
+- tbm/utilities.py - general purpose constructs.
+- tbm/vector_pipe.py - defines VectorPipe, a vector functional unit model.
 
 ### Other files:
 
 - config/uarch.schema.json - JSON schema for uArch configuration files.
-- config/default_arch.yaml - a uArch configuration example.
+- config/rvv-simple.yaml - a uArch configuration example.
diff --git a/buffered_queue.py b/tbm/buffered_queue.py
similarity index 100%
rename from buffered_queue.py
rename to tbm/buffered_queue.py
diff --git a/counter.py b/tbm/counter.py
similarity index 100%
rename from counter.py
rename to tbm/counter.py
diff --git a/cpu.py b/tbm/cpu.py
similarity index 100%
rename from cpu.py
rename to tbm/cpu.py
diff --git a/disassembler.py b/tbm/disassembler.py
similarity index 100%
rename from disassembler.py
rename to tbm/disassembler.py
diff --git a/exec_unit.py b/tbm/exec_unit.py
similarity index 100%
rename from exec_unit.py
rename to tbm/exec_unit.py
diff --git a/fetch_unit.py b/tbm/fetch_unit.py
similarity index 100%
rename from fetch_unit.py
rename to tbm/fetch_unit.py
diff --git a/functional_trace.py b/tbm/functional_trace.py
similarity index 100%
rename from functional_trace.py
rename to tbm/functional_trace.py
diff --git a/gentrace-spike.py b/tbm/gentrace-spike.py
similarity index 100%
rename from gentrace-spike.py
rename to tbm/gentrace-spike.py
diff --git a/instruction.fbs b/tbm/instruction.fbs
similarity index 100%
rename from instruction.fbs
rename to tbm/instruction.fbs
diff --git a/instruction.py b/tbm/instruction.py
similarity index 100%
rename from instruction.py
rename to tbm/instruction.py
diff --git a/interfaces.py b/tbm/interfaces.py
similarity index 100%
rename from interfaces.py
rename to tbm/interfaces.py
diff --git a/memory_system.py b/tbm/memory_system.py
similarity index 100%
rename from memory_system.py
rename to tbm/memory_system.py
diff --git a/scalar_pipe.py b/tbm/scalar_pipe.py
similarity index 100%
rename from scalar_pipe.py
rename to tbm/scalar_pipe.py
diff --git a/sched_unit.py b/tbm/sched_unit.py
similarity index 100%
rename from sched_unit.py
rename to tbm/sched_unit.py
diff --git a/scoreboard.py b/tbm/scoreboard.py
similarity index 100%
rename from scoreboard.py
rename to tbm/scoreboard.py
diff --git a/tbm.py b/tbm/tbm.py
similarity index 100%
rename from tbm.py
rename to tbm/tbm.py
diff --git a/tbm_options.py b/tbm/tbm_options.py
similarity index 100%
rename from tbm_options.py
rename to tbm/tbm_options.py
diff --git a/utilities.py b/tbm/utilities.py
similarity index 100%
rename from utilities.py
rename to tbm/utilities.py
diff --git a/vector_pipe.py b/tbm/vector_pipe.py
similarity index 100%
rename from vector_pipe.py
rename to tbm/vector_pipe.py