diff --git a/utils/imxtools/hwemul/hwemul_protocol.h b/utils/hwstub/hwemul_protocol.h
similarity index 100%
rename from utils/imxtools/hwemul/hwemul_protocol.h
rename to utils/hwstub/hwemul_protocol.h
diff --git a/utils/imxtools/hwemul/lib/Makefile b/utils/hwstub/lib/Makefile
similarity index 100%
rename from utils/imxtools/hwemul/lib/Makefile
rename to utils/hwstub/lib/Makefile
diff --git a/utils/imxtools/hwemul/lib/hwemul.c b/utils/hwstub/lib/hwemul.c
similarity index 100%
rename from utils/imxtools/hwemul/lib/hwemul.c
rename to utils/hwstub/lib/hwemul.c
diff --git a/utils/imxtools/hwemul/lib/hwemul.h b/utils/hwstub/lib/hwemul.h
similarity index 100%
rename from utils/imxtools/hwemul/lib/hwemul.h
rename to utils/hwstub/lib/hwemul.h
diff --git a/utils/imxtools/hwemul/lib/hwemul_protocol.h b/utils/hwstub/lib/hwemul_protocol.h
similarity index 100%
rename from utils/imxtools/hwemul/lib/hwemul_protocol.h
rename to utils/hwstub/lib/hwemul_protocol.h
diff --git a/utils/imxtools/hwemul/dev/Makefile b/utils/hwstub/stmp/Makefile
similarity index 100%
rename from utils/imxtools/hwemul/dev/Makefile
rename to utils/hwstub/stmp/Makefile
diff --git a/utils/imxtools/hwemul/dev/config.h b/utils/hwstub/stmp/config.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/config.h
rename to utils/hwstub/stmp/config.h
diff --git a/utils/imxtools/hwemul/dev/crt0.S b/utils/hwstub/stmp/crt0.S
similarity index 100%
rename from utils/imxtools/hwemul/dev/crt0.S
rename to utils/hwstub/stmp/crt0.S
diff --git a/utils/imxtools/hwemul/dev/format.c b/utils/hwstub/stmp/format.c
similarity index 100%
rename from utils/imxtools/hwemul/dev/format.c
rename to utils/hwstub/stmp/format.c
diff --git a/utils/imxtools/hwemul/dev/format.h b/utils/hwstub/stmp/format.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/format.h
rename to utils/hwstub/stmp/format.h
diff --git a/utils/imxtools/hwemul/dev/hwemul.db b/utils/hwstub/stmp/hwemul.db
similarity index 100%
rename from utils/imxtools/hwemul/dev/hwemul.db
rename to utils/hwstub/stmp/hwemul.db
diff --git a/utils/imxtools/hwemul/dev/hwemul.lds b/utils/hwstub/stmp/hwemul.lds
similarity index 100%
rename from utils/imxtools/hwemul/dev/hwemul.lds
rename to utils/hwstub/stmp/hwemul.lds
diff --git a/utils/imxtools/hwemul/dev/link.lds b/utils/hwstub/stmp/link.lds
similarity index 100%
rename from utils/imxtools/hwemul/dev/link.lds
rename to utils/hwstub/stmp/link.lds
diff --git a/utils/imxtools/hwemul/dev/logf.c b/utils/hwstub/stmp/logf.c
similarity index 100%
rename from utils/imxtools/hwemul/dev/logf.c
rename to utils/hwstub/stmp/logf.c
diff --git a/utils/imxtools/hwemul/dev/logf.h b/utils/hwstub/stmp/logf.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/logf.h
rename to utils/hwstub/stmp/logf.h
diff --git a/utils/imxtools/hwemul/dev/main.c b/utils/hwstub/stmp/main.c
similarity index 100%
rename from utils/imxtools/hwemul/dev/main.c
rename to utils/hwstub/stmp/main.c
diff --git a/utils/imxtools/hwemul/dev/protocol.h b/utils/hwstub/stmp/protocol.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/protocol.h
rename to utils/hwstub/stmp/protocol.h
diff --git a/utils/imxtools/hwemul/dev/stddef.h b/utils/hwstub/stmp/stddef.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/stddef.h
rename to utils/hwstub/stmp/stddef.h
diff --git a/utils/imxtools/hwemul/dev/stdint.h b/utils/hwstub/stmp/stdint.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/stdint.h
rename to utils/hwstub/stmp/stdint.h
diff --git a/utils/imxtools/hwemul/dev/string.c b/utils/hwstub/stmp/string.c
similarity index 100%
rename from utils/imxtools/hwemul/dev/string.c
rename to utils/hwstub/stmp/string.c
diff --git a/utils/imxtools/hwemul/dev/string.h b/utils/hwstub/stmp/string.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/string.h
rename to utils/hwstub/stmp/string.h
diff --git a/utils/imxtools/hwemul/dev/system.h b/utils/hwstub/stmp/system.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/system.h
rename to utils/hwstub/stmp/system.h
diff --git a/utils/imxtools/hwemul/dev/usb_ch9.h b/utils/hwstub/stmp/usb_ch9.h
similarity index 100%
rename from utils/imxtools/hwemul/dev/usb_ch9.h
rename to utils/hwstub/stmp/usb_ch9.h
diff --git a/utils/imxtools/hwemul/tools/Makefile b/utils/hwstub/tools/Makefile
similarity index 100%
rename from utils/imxtools/hwemul/tools/Makefile
rename to utils/hwstub/tools/Makefile
diff --git a/utils/imxtools/hwemul/tools/hwemul_tool.c b/utils/hwstub/tools/hwemul_tool.c
similarity index 100%
rename from utils/imxtools/hwemul/tools/hwemul_tool.c
rename to utils/hwstub/tools/hwemul_tool.c