diff --git a/util/m5/Android.mk b/util/m5/src/Android.mk
similarity index 100%
rename from util/m5/Android.mk
rename to util/m5/src/Android.mk
diff --git a/util/m5/Makefile.aarch64 b/util/m5/src/Makefile.aarch64
similarity index 98%
rename from util/m5/Makefile.aarch64
rename to util/m5/src/Makefile.aarch64
index f0b6494258..c1c084d006 100644
--- a/util/m5/Makefile.aarch64
+++ b/util/m5/src/Makefile.aarch64
@@ -52,7 +52,7 @@ JR=jar
 #JDK_PATH=/path/to/jdk/version_number
 
 CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux \
-       -I../../include -march=armv8-a
+       -I../../../include -march=armv8-a
 LDFLAGS=-static -L. -lm5
 
 LIB_OBJS=m5op_arm_A64.o m5_mmap.o
diff --git a/util/m5/Makefile.arm b/util/m5/src/Makefile.arm
similarity index 98%
rename from util/m5/Makefile.arm
rename to util/m5/src/Makefile.arm
index 1fd1840fd3..042cf00696 100644
--- a/util/m5/Makefile.arm
+++ b/util/m5/src/Makefile.arm
@@ -52,7 +52,7 @@ JR=jar
 #JDK_PATH=/path/to/jdk/version_number
 
 CFLAGS=-O2 -I $(JDK_PATH)/include/ -I $(JDK_PATH)/include/linux \
-       -I../../include -march=armv7-a
+       -I../../../include -march=armv7-a
 LDFLAGS=-L. -lm5 -static
 
 LIB_OBJS=m5op_arm.o m5_mmap.o
diff --git a/util/m5/Makefile.sparc b/util/m5/src/Makefile.sparc
similarity index 98%
rename from util/m5/Makefile.sparc
rename to util/m5/src/Makefile.sparc
index 9f19db9fb8..2424784369 100644
--- a/util/m5/Makefile.sparc
+++ b/util/m5/src/Makefile.sparc
@@ -32,7 +32,7 @@ CC=$(CROSS_COMPILE)gcc
 AS=$(CROSS_COMPILE)as
 LD=$(CROSS_COMPILE)ld
 
-CFLAGS=-O2 -m64 -I../../include
+CFLAGS=-O2 -m64 -I../../../include
 OBJS=m5.o m5op_sparc.o m5_mmap.o
 
 all: m5
diff --git a/util/m5/Makefile.thumb b/util/m5/src/Makefile.thumb
similarity index 98%
rename from util/m5/Makefile.thumb
rename to util/m5/src/Makefile.thumb
index 1d7ad518e8..1eb5b3d5d9 100644
--- a/util/m5/Makefile.thumb
+++ b/util/m5/src/Makefile.thumb
@@ -46,7 +46,7 @@ LD=$(CROSS_COMPILE)ld
 AR=$(CROSS_COMPILE)ar
 
 #CFLAGS=-O2 -march=armv7 -mthumb -I../../include
-CFLAGS=-O2 -mthumb -I../../include
+CFLAGS=-O2 -mthumb -I../../../include
 LDFLAGS=-L. -lm5
 
 OBJS=m5.o
diff --git a/util/m5/Makefile.x86 b/util/m5/src/Makefile.x86
similarity index 97%
rename from util/m5/Makefile.x86
rename to util/m5/src/Makefile.x86
index fae81bbae7..59493ce3aa 100644
--- a/util/m5/Makefile.x86
+++ b/util/m5/src/Makefile.x86
@@ -28,7 +28,7 @@ CC=gcc
 AS=as
 LD=ld
 
-CFLAGS?=-O2 -DM5OP_ADDR=0xFFFF0000 -I../../include
+CFLAGS?=-O2 -DM5OP_ADDR=0xFFFF0000 -I../../../include
 OBJS=m5.o m5op_x86.o m5_mmap.o
 LUA_HEADER_INCLUDE=$(shell pkg-config --cflags-only-I lua51)
 LUA_OBJS=lua_gem5Op.opic m5op_x86.opic m5_mmap.opic
diff --git a/util/m5/jni/gem5Op.java b/util/m5/src/jni/gem5Op.java
similarity index 100%
rename from util/m5/jni/gem5Op.java
rename to util/m5/src/jni/gem5Op.java
diff --git a/util/m5/jni_gem5Op.c b/util/m5/src/jni_gem5Op.c
similarity index 100%
rename from util/m5/jni_gem5Op.c
rename to util/m5/src/jni_gem5Op.c
diff --git a/util/m5/lua_gem5Op.c b/util/m5/src/lua_gem5Op.c
similarity index 100%
rename from util/m5/lua_gem5Op.c
rename to util/m5/src/lua_gem5Op.c
diff --git a/util/m5/m5.c b/util/m5/src/m5.c
similarity index 100%
rename from util/m5/m5.c
rename to util/m5/src/m5.c
diff --git a/util/m5/m5_mmap.c b/util/m5/src/m5_mmap.c
similarity index 100%
rename from util/m5/m5_mmap.c
rename to util/m5/src/m5_mmap.c
diff --git a/util/m5/m5_mmap.h b/util/m5/src/m5_mmap.h
similarity index 100%
rename from util/m5/m5_mmap.h
rename to util/m5/src/m5_mmap.h
diff --git a/util/m5/m5op_arm.S b/util/m5/src/m5op_arm.S
similarity index 100%
rename from util/m5/m5op_arm.S
rename to util/m5/src/m5op_arm.S
diff --git a/util/m5/m5op_arm_A64.S b/util/m5/src/m5op_arm_A64.S
similarity index 100%
rename from util/m5/m5op_arm_A64.S
rename to util/m5/src/m5op_arm_A64.S
diff --git a/util/m5/m5op_sparc.S b/util/m5/src/m5op_sparc.S
similarity index 100%
rename from util/m5/m5op_sparc.S
rename to util/m5/src/m5op_sparc.S
diff --git a/util/m5/m5op_x86.S b/util/m5/src/m5op_x86.S
similarity index 100%
rename from util/m5/m5op_x86.S
rename to util/m5/src/m5op_x86.S