diff --git a/sim/cache/lzss_compression.cc b/base/compression/lzss_compression.cc
similarity index 100%
rename from sim/cache/lzss_compression.cc
rename to base/compression/lzss_compression.cc
diff --git a/sim/cache/lzss_compression.hh b/base/compression/lzss_compression.hh
similarity index 100%
rename from sim/cache/lzss_compression.hh
rename to base/compression/lzss_compression.hh
diff --git a/sim/cache/null_compression.hh b/base/compression/null_compression.hh
similarity index 100%
rename from sim/cache/null_compression.hh
rename to base/compression/null_compression.hh
diff --git a/sim/hybrid_pred.cc b/base/hybrid_pred.cc
similarity index 100%
rename from sim/hybrid_pred.cc
rename to base/hybrid_pred.cc
diff --git a/sim/hybrid_pred.hh b/base/hybrid_pred.hh
similarity index 100%
rename from sim/hybrid_pred.hh
rename to base/hybrid_pred.hh
diff --git a/base/aout_object.cc b/base/loader/aout_object.cc
similarity index 100%
rename from base/aout_object.cc
rename to base/loader/aout_object.cc
diff --git a/base/aout_object.hh b/base/loader/aout_object.hh
similarity index 100%
rename from base/aout_object.hh
rename to base/loader/aout_object.hh
diff --git a/base/coff_sym.h b/base/loader/coff_sym.h
similarity index 100%
rename from base/coff_sym.h
rename to base/loader/coff_sym.h
diff --git a/base/coff_symconst.h b/base/loader/coff_symconst.h
similarity index 100%
rename from base/coff_symconst.h
rename to base/loader/coff_symconst.h
diff --git a/base/ecoff_object.cc b/base/loader/ecoff_object.cc
similarity index 100%
rename from base/ecoff_object.cc
rename to base/loader/ecoff_object.cc
diff --git a/base/ecoff_object.hh b/base/loader/ecoff_object.hh
similarity index 100%
rename from base/ecoff_object.hh
rename to base/loader/ecoff_object.hh
diff --git a/base/elf_object.cc b/base/loader/elf_object.cc
similarity index 100%
rename from base/elf_object.cc
rename to base/loader/elf_object.cc
diff --git a/base/elf_object.hh b/base/loader/elf_object.hh
similarity index 100%
rename from base/elf_object.hh
rename to base/loader/elf_object.hh
diff --git a/base/exec_aout.h b/base/loader/exec_aout.h
similarity index 100%
rename from base/exec_aout.h
rename to base/loader/exec_aout.h
diff --git a/base/exec_ecoff.h b/base/loader/exec_ecoff.h
similarity index 100%
rename from base/exec_ecoff.h
rename to base/loader/exec_ecoff.h
diff --git a/base/object_file.cc b/base/loader/object_file.cc
similarity index 100%
rename from base/object_file.cc
rename to base/loader/object_file.cc
diff --git a/base/object_file.hh b/base/loader/object_file.hh
similarity index 100%
rename from base/object_file.hh
rename to base/loader/object_file.hh
diff --git a/base/symtab.cc b/base/loader/symtab.cc
similarity index 100%
rename from base/symtab.cc
rename to base/loader/symtab.cc
diff --git a/base/symtab.hh b/base/loader/symtab.hh
similarity index 100%
rename from base/symtab.hh
rename to base/loader/symtab.hh
diff --git a/sim/predictor.hh b/base/predictor.hh
similarity index 100%
rename from sim/predictor.hh
rename to base/predictor.hh
diff --git a/sim/sat_counter.cc b/base/sat_counter.cc
similarity index 100%
rename from sim/sat_counter.cc
rename to base/sat_counter.cc
diff --git a/sim/sat_counter.hh b/base/sat_counter.hh
similarity index 100%
rename from sim/sat_counter.hh
rename to base/sat_counter.hh
diff --git a/sim/base_cpu.cc b/cpu/base_cpu.cc
similarity index 100%
rename from sim/base_cpu.cc
rename to cpu/base_cpu.cc
diff --git a/sim/base_cpu.hh b/cpu/base_cpu.hh
similarity index 100%
rename from sim/base_cpu.hh
rename to cpu/base_cpu.hh
diff --git a/sim/exec_context.cc b/cpu/exec_context.cc
similarity index 100%
rename from sim/exec_context.cc
rename to cpu/exec_context.cc
diff --git a/sim/exec_context.hh b/cpu/exec_context.hh
similarity index 100%
rename from sim/exec_context.hh
rename to cpu/exec_context.hh
diff --git a/sim/exetrace.cc b/cpu/exetrace.cc
similarity index 100%
rename from sim/exetrace.cc
rename to cpu/exetrace.cc
diff --git a/sim/exetrace.hh b/cpu/exetrace.hh
similarity index 100%
rename from sim/exetrace.hh
rename to cpu/exetrace.hh
diff --git a/sim/op_class.hh b/cpu/full_cpu/op_class.hh
similarity index 100%
rename from sim/op_class.hh
rename to cpu/full_cpu/op_class.hh
diff --git a/sim/smt.hh b/cpu/full_cpu/smt.hh
similarity index 100%
rename from sim/smt.hh
rename to cpu/full_cpu/smt.hh
diff --git a/sim/inst_seq.hh b/cpu/inst_seq.hh
similarity index 100%
rename from sim/inst_seq.hh
rename to cpu/inst_seq.hh
diff --git a/sim/intr_control.cc b/cpu/intr_control.cc
similarity index 100%
rename from sim/intr_control.cc
rename to cpu/intr_control.cc
diff --git a/sim/intr_control.hh b/cpu/intr_control.hh
similarity index 100%
rename from sim/intr_control.hh
rename to cpu/intr_control.hh
diff --git a/sim/memtest.cc b/cpu/memtest/memtest.cc
similarity index 100%
rename from sim/memtest.cc
rename to cpu/memtest/memtest.cc
diff --git a/sim/memtest.hh b/cpu/memtest/memtest.hh
similarity index 100%
rename from sim/memtest.hh
rename to cpu/memtest/memtest.hh
diff --git a/sim/pc_event.cc b/cpu/pc_event.cc
similarity index 100%
rename from sim/pc_event.cc
rename to cpu/pc_event.cc
diff --git a/sim/pc_event.hh b/cpu/pc_event.hh
similarity index 100%
rename from sim/pc_event.hh
rename to cpu/pc_event.hh
diff --git a/sim/simple_cpu.cc b/cpu/simple_cpu/simple_cpu.cc
similarity index 100%
rename from sim/simple_cpu.cc
rename to cpu/simple_cpu/simple_cpu.cc
diff --git a/sim/simple_cpu.hh b/cpu/simple_cpu/simple_cpu.hh
similarity index 100%
rename from sim/simple_cpu.hh
rename to cpu/simple_cpu/simple_cpu.hh
diff --git a/sim/static_inst.cc b/cpu/static_inst.cc
similarity index 100%
rename from sim/static_inst.cc
rename to cpu/static_inst.cc
diff --git a/sim/static_inst.hh b/cpu/static_inst.hh
similarity index 100%
rename from sim/static_inst.hh
rename to cpu/static_inst.hh