diff --git a/BasiliskII/src/uae_cpu/basilisk_glue.cpp b/BasiliskII/src/uae_cpu_2021/basilisk_glue.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/basilisk_glue.cpp
rename to BasiliskII/src/uae_cpu_2021/basilisk_glue.cpp
diff --git a/BasiliskII/src/uae_cpu/build68k.c b/BasiliskII/src/uae_cpu_2021/build68k.c
similarity index 100%
rename from BasiliskII/src/uae_cpu/build68k.c
rename to BasiliskII/src/uae_cpu_2021/build68k.c
diff --git a/BasiliskII/src/uae_cpu/compiler/codegen_x86.cpp b/BasiliskII/src/uae_cpu_2021/compiler/codegen_x86.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/codegen_x86.cpp
rename to BasiliskII/src/uae_cpu_2021/compiler/codegen_x86.cpp
diff --git a/BasiliskII/src/uae_cpu/compiler/codegen_x86.h b/BasiliskII/src/uae_cpu_2021/compiler/codegen_x86.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/codegen_x86.h
rename to BasiliskII/src/uae_cpu_2021/compiler/codegen_x86.h
diff --git a/BasiliskII/src/uae_cpu/compiler/compemu.h b/BasiliskII/src/uae_cpu_2021/compiler/compemu.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/compemu.h
rename to BasiliskII/src/uae_cpu_2021/compiler/compemu.h
diff --git a/BasiliskII/src/uae_cpu/compiler/compemu_fpp.cpp b/BasiliskII/src/uae_cpu_2021/compiler/compemu_fpp.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/compemu_fpp.cpp
rename to BasiliskII/src/uae_cpu_2021/compiler/compemu_fpp.cpp
diff --git a/BasiliskII/src/uae_cpu/compiler/compemu_midfunc_x86.cpp b/BasiliskII/src/uae_cpu_2021/compiler/compemu_midfunc_x86.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/compemu_midfunc_x86.cpp
rename to BasiliskII/src/uae_cpu_2021/compiler/compemu_midfunc_x86.cpp
diff --git a/BasiliskII/src/uae_cpu/compiler/compemu_midfunc_x86.h b/BasiliskII/src/uae_cpu_2021/compiler/compemu_midfunc_x86.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/compemu_midfunc_x86.h
rename to BasiliskII/src/uae_cpu_2021/compiler/compemu_midfunc_x86.h
diff --git a/BasiliskII/src/uae_cpu/compiler/compemu_support.cpp b/BasiliskII/src/uae_cpu_2021/compiler/compemu_support.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/compemu_support.cpp
rename to BasiliskII/src/uae_cpu_2021/compiler/compemu_support.cpp
diff --git a/BasiliskII/src/uae_cpu/compiler/flags_x86.h b/BasiliskII/src/uae_cpu_2021/compiler/flags_x86.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/flags_x86.h
rename to BasiliskII/src/uae_cpu_2021/compiler/flags_x86.h
diff --git a/BasiliskII/src/uae_cpu/compiler/gencomp.c b/BasiliskII/src/uae_cpu_2021/compiler/gencomp.c
similarity index 100%
rename from BasiliskII/src/uae_cpu/compiler/gencomp.c
rename to BasiliskII/src/uae_cpu_2021/compiler/gencomp.c
diff --git a/BasiliskII/src/uae_cpu/cpu_emulation.h b/BasiliskII/src/uae_cpu_2021/cpu_emulation.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/cpu_emulation.h
rename to BasiliskII/src/uae_cpu_2021/cpu_emulation.h
diff --git a/BasiliskII/src/uae_cpu/cpummu.h b/BasiliskII/src/uae_cpu_2021/cpummu.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/cpummu.h
rename to BasiliskII/src/uae_cpu_2021/cpummu.h
diff --git a/BasiliskII/src/uae_cpu/fpu/core.h b/BasiliskII/src/uae_cpu_2021/fpu/core.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/core.h
rename to BasiliskII/src/uae_cpu_2021/fpu/core.h
diff --git a/BasiliskII/src/uae_cpu/fpu/exceptions.cpp b/BasiliskII/src/uae_cpu_2021/fpu/exceptions.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/exceptions.cpp
rename to BasiliskII/src/uae_cpu_2021/fpu/exceptions.cpp
diff --git a/BasiliskII/src/uae_cpu/fpu/exceptions.h b/BasiliskII/src/uae_cpu_2021/fpu/exceptions.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/exceptions.h
rename to BasiliskII/src/uae_cpu_2021/fpu/exceptions.h
diff --git a/BasiliskII/src/uae_cpu/fpu/flags.cpp b/BasiliskII/src/uae_cpu_2021/fpu/flags.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/flags.cpp
rename to BasiliskII/src/uae_cpu_2021/fpu/flags.cpp
diff --git a/BasiliskII/src/uae_cpu/fpu/flags.h b/BasiliskII/src/uae_cpu_2021/fpu/flags.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/flags.h
rename to BasiliskII/src/uae_cpu_2021/fpu/flags.h
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu.h b/BasiliskII/src/uae_cpu_2021/fpu/fpu.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu.h
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu.h
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_ieee.cpp b/BasiliskII/src/uae_cpu_2021/fpu/fpu_ieee.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu_ieee.cpp
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu_ieee.cpp
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_ieee.h b/BasiliskII/src/uae_cpu_2021/fpu/fpu_ieee.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu_ieee.h
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu_ieee.h
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_mpfr.cpp b/BasiliskII/src/uae_cpu_2021/fpu/fpu_mpfr.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu_mpfr.cpp
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu_mpfr.cpp
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_uae.cpp b/BasiliskII/src/uae_cpu_2021/fpu/fpu_uae.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu_uae.cpp
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu_uae.cpp
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_uae.h b/BasiliskII/src/uae_cpu_2021/fpu/fpu_uae.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu_uae.h
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu_uae.h
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_x86.cpp b/BasiliskII/src/uae_cpu_2021/fpu/fpu_x86.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu_x86.cpp
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu_x86.cpp
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_x86.h b/BasiliskII/src/uae_cpu_2021/fpu/fpu_x86.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu_x86.h
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu_x86.h
diff --git a/BasiliskII/src/uae_cpu/fpu/fpu_x86_asm.h b/BasiliskII/src/uae_cpu_2021/fpu/fpu_x86_asm.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/fpu_x86_asm.h
rename to BasiliskII/src/uae_cpu_2021/fpu/fpu_x86_asm.h
diff --git a/BasiliskII/src/uae_cpu/fpu/impl.h b/BasiliskII/src/uae_cpu_2021/fpu/impl.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/impl.h
rename to BasiliskII/src/uae_cpu_2021/fpu/impl.h
diff --git a/BasiliskII/src/uae_cpu/fpu/mathlib.cpp b/BasiliskII/src/uae_cpu_2021/fpu/mathlib.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/mathlib.cpp
rename to BasiliskII/src/uae_cpu_2021/fpu/mathlib.cpp
diff --git a/BasiliskII/src/uae_cpu/fpu/mathlib.h b/BasiliskII/src/uae_cpu_2021/fpu/mathlib.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/mathlib.h
rename to BasiliskII/src/uae_cpu_2021/fpu/mathlib.h
diff --git a/BasiliskII/src/uae_cpu/fpu/rounding.cpp b/BasiliskII/src/uae_cpu_2021/fpu/rounding.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/rounding.cpp
rename to BasiliskII/src/uae_cpu_2021/fpu/rounding.cpp
diff --git a/BasiliskII/src/uae_cpu/fpu/rounding.h b/BasiliskII/src/uae_cpu_2021/fpu/rounding.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/rounding.h
rename to BasiliskII/src/uae_cpu_2021/fpu/rounding.h
diff --git a/BasiliskII/src/uae_cpu/fpu/types.h b/BasiliskII/src/uae_cpu_2021/fpu/types.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/fpu/types.h
rename to BasiliskII/src/uae_cpu_2021/fpu/types.h
diff --git a/BasiliskII/src/uae_cpu/gencpu.c b/BasiliskII/src/uae_cpu_2021/gencpu.c
similarity index 100%
rename from BasiliskII/src/uae_cpu/gencpu.c
rename to BasiliskII/src/uae_cpu_2021/gencpu.c
diff --git a/BasiliskII/src/uae_cpu/m68k.h b/BasiliskII/src/uae_cpu_2021/m68k.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/m68k.h
rename to BasiliskII/src/uae_cpu_2021/m68k.h
diff --git a/BasiliskII/src/uae_cpu/memory.h b/BasiliskII/src/uae_cpu_2021/memory.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/memory.h
rename to BasiliskII/src/uae_cpu_2021/memory.h
diff --git a/BasiliskII/src/uae_cpu/newcpu.cpp b/BasiliskII/src/uae_cpu_2021/newcpu.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/newcpu.cpp
rename to BasiliskII/src/uae_cpu_2021/newcpu.cpp
diff --git a/BasiliskII/src/uae_cpu/newcpu.h b/BasiliskII/src/uae_cpu_2021/newcpu.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/newcpu.h
rename to BasiliskII/src/uae_cpu_2021/newcpu.h
diff --git a/BasiliskII/src/uae_cpu/readcpu.cpp b/BasiliskII/src/uae_cpu_2021/readcpu.cpp
similarity index 100%
rename from BasiliskII/src/uae_cpu/readcpu.cpp
rename to BasiliskII/src/uae_cpu_2021/readcpu.cpp
diff --git a/BasiliskII/src/uae_cpu/readcpu.h b/BasiliskII/src/uae_cpu_2021/readcpu.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/readcpu.h
rename to BasiliskII/src/uae_cpu_2021/readcpu.h
diff --git a/BasiliskII/src/uae_cpu/registers.h b/BasiliskII/src/uae_cpu_2021/registers.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/registers.h
rename to BasiliskII/src/uae_cpu_2021/registers.h
diff --git a/BasiliskII/src/uae_cpu/spcflags.h b/BasiliskII/src/uae_cpu_2021/spcflags.h
similarity index 100%
rename from BasiliskII/src/uae_cpu/spcflags.h
rename to BasiliskII/src/uae_cpu_2021/spcflags.h
diff --git a/BasiliskII/src/uae_cpu/table68k b/BasiliskII/src/uae_cpu_2021/table68k
similarity index 100%
rename from BasiliskII/src/uae_cpu/table68k
rename to BasiliskII/src/uae_cpu_2021/table68k