diff --git a/reactos/base/shell/CMakeLists.txt b/reactos/base/shell/CMakeLists.txt
index 0b89f3116d0..a84afd1fbea 100644
--- a/reactos/base/shell/CMakeLists.txt
+++ b/reactos/base/shell/CMakeLists.txt
@@ -7,6 +7,5 @@ add_subdirectory(ie)
 add_subdirectory(rshell)
 add_subdirectory(shell32)
 add_subdirectory(shfolder)
-add_subdirectory(shimgvw)
 add_subdirectory(shlwapi)
 add_subdirectory(shellext)
diff --git a/reactos/base/shell/shellext/CMakeLists.txt b/reactos/base/shell/shellext/CMakeLists.txt
index 07c20ef60f6..563ef23b073 100644
--- a/reactos/base/shell/shellext/CMakeLists.txt
+++ b/reactos/base/shell/shellext/CMakeLists.txt
@@ -5,5 +5,6 @@ add_subdirectory(devcpux)
 add_subdirectory(fontext)
 add_subdirectory(netshell)
 add_subdirectory(ntobjshex)
+add_subdirectory(shimgvw)
 add_subdirectory(slayer)
 add_subdirectory(stobject)
\ No newline at end of file
diff --git a/reactos/base/shell/shimgvw/CMakeLists.txt b/reactos/base/shell/shellext/shimgvw/CMakeLists.txt
similarity index 100%
rename from reactos/base/shell/shimgvw/CMakeLists.txt
rename to reactos/base/shell/shellext/shimgvw/CMakeLists.txt
diff --git a/reactos/base/shell/shimgvw/comsup.c b/reactos/base/shell/shellext/shimgvw/comsup.c
similarity index 100%
rename from reactos/base/shell/shimgvw/comsup.c
rename to reactos/base/shell/shellext/shimgvw/comsup.c
diff --git a/reactos/base/shell/shimgvw/comsup.h b/reactos/base/shell/shellext/shimgvw/comsup.h
similarity index 100%
rename from reactos/base/shell/shimgvw/comsup.h
rename to reactos/base/shell/shellext/shimgvw/comsup.h
diff --git a/reactos/base/shell/shimgvw/lang/bg-BG.rc b/reactos/base/shell/shellext/shimgvw/lang/bg-BG.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/bg-BG.rc
rename to reactos/base/shell/shellext/shimgvw/lang/bg-BG.rc
diff --git a/reactos/base/shell/shimgvw/lang/cs-CZ.rc b/reactos/base/shell/shellext/shimgvw/lang/cs-CZ.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/cs-CZ.rc
rename to reactos/base/shell/shellext/shimgvw/lang/cs-CZ.rc
diff --git a/reactos/base/shell/shimgvw/lang/de-DE.rc b/reactos/base/shell/shellext/shimgvw/lang/de-DE.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/de-DE.rc
rename to reactos/base/shell/shellext/shimgvw/lang/de-DE.rc
diff --git a/reactos/base/shell/shimgvw/lang/en-US.rc b/reactos/base/shell/shellext/shimgvw/lang/en-US.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/en-US.rc
rename to reactos/base/shell/shellext/shimgvw/lang/en-US.rc
diff --git a/reactos/base/shell/shimgvw/lang/es-ES.rc b/reactos/base/shell/shellext/shimgvw/lang/es-ES.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/es-ES.rc
rename to reactos/base/shell/shellext/shimgvw/lang/es-ES.rc
diff --git a/reactos/base/shell/shimgvw/lang/fr-FR.rc b/reactos/base/shell/shellext/shimgvw/lang/fr-FR.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/fr-FR.rc
rename to reactos/base/shell/shellext/shimgvw/lang/fr-FR.rc
diff --git a/reactos/base/shell/shimgvw/lang/he-IL.rc b/reactos/base/shell/shellext/shimgvw/lang/he-IL.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/he-IL.rc
rename to reactos/base/shell/shellext/shimgvw/lang/he-IL.rc
diff --git a/reactos/base/shell/shimgvw/lang/it-IT.rc b/reactos/base/shell/shellext/shimgvw/lang/it-IT.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/it-IT.rc
rename to reactos/base/shell/shellext/shimgvw/lang/it-IT.rc
diff --git a/reactos/base/shell/shimgvw/lang/lt-LT.rc b/reactos/base/shell/shellext/shimgvw/lang/lt-LT.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/lt-LT.rc
rename to reactos/base/shell/shellext/shimgvw/lang/lt-LT.rc
diff --git a/reactos/base/shell/shimgvw/lang/no-NO.rc b/reactos/base/shell/shellext/shimgvw/lang/no-NO.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/no-NO.rc
rename to reactos/base/shell/shellext/shimgvw/lang/no-NO.rc
diff --git a/reactos/base/shell/shimgvw/lang/pl-PL.rc b/reactos/base/shell/shellext/shimgvw/lang/pl-PL.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/pl-PL.rc
rename to reactos/base/shell/shellext/shimgvw/lang/pl-PL.rc
diff --git a/reactos/base/shell/shimgvw/lang/ro-RO.rc b/reactos/base/shell/shellext/shimgvw/lang/ro-RO.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/ro-RO.rc
rename to reactos/base/shell/shellext/shimgvw/lang/ro-RO.rc
diff --git a/reactos/base/shell/shimgvw/lang/ru-RU.rc b/reactos/base/shell/shellext/shimgvw/lang/ru-RU.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/ru-RU.rc
rename to reactos/base/shell/shellext/shimgvw/lang/ru-RU.rc
diff --git a/reactos/base/shell/shimgvw/lang/sk-SK.rc b/reactos/base/shell/shellext/shimgvw/lang/sk-SK.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/sk-SK.rc
rename to reactos/base/shell/shellext/shimgvw/lang/sk-SK.rc
diff --git a/reactos/base/shell/shimgvw/lang/sq-AL.rc b/reactos/base/shell/shellext/shimgvw/lang/sq-AL.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/sq-AL.rc
rename to reactos/base/shell/shellext/shimgvw/lang/sq-AL.rc
diff --git a/reactos/base/shell/shimgvw/lang/tr-TR.rc b/reactos/base/shell/shellext/shimgvw/lang/tr-TR.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/tr-TR.rc
rename to reactos/base/shell/shellext/shimgvw/lang/tr-TR.rc
diff --git a/reactos/base/shell/shimgvw/lang/uk-UA.rc b/reactos/base/shell/shellext/shimgvw/lang/uk-UA.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/lang/uk-UA.rc
rename to reactos/base/shell/shellext/shimgvw/lang/uk-UA.rc
diff --git a/reactos/base/shell/shimgvw/res/main.ico b/reactos/base/shell/shellext/shimgvw/res/main.ico
similarity index 100%
rename from reactos/base/shell/shimgvw/res/main.ico
rename to reactos/base/shell/shellext/shimgvw/res/main.ico
diff --git a/reactos/base/shell/shimgvw/res/next.bmp b/reactos/base/shell/shellext/shimgvw/res/next.bmp
similarity index 100%
rename from reactos/base/shell/shimgvw/res/next.bmp
rename to reactos/base/shell/shellext/shimgvw/res/next.bmp
diff --git a/reactos/base/shell/shimgvw/res/prev.bmp b/reactos/base/shell/shellext/shimgvw/res/prev.bmp
similarity index 100%
rename from reactos/base/shell/shimgvw/res/prev.bmp
rename to reactos/base/shell/shellext/shimgvw/res/prev.bmp
diff --git a/reactos/base/shell/shimgvw/res/print.bmp b/reactos/base/shell/shellext/shimgvw/res/print.bmp
similarity index 100%
rename from reactos/base/shell/shimgvw/res/print.bmp
rename to reactos/base/shell/shellext/shimgvw/res/print.bmp
diff --git a/reactos/base/shell/shimgvw/res/rot1.bmp b/reactos/base/shell/shellext/shimgvw/res/rot1.bmp
similarity index 100%
rename from reactos/base/shell/shimgvw/res/rot1.bmp
rename to reactos/base/shell/shellext/shimgvw/res/rot1.bmp
diff --git a/reactos/base/shell/shimgvw/res/rot2.bmp b/reactos/base/shell/shellext/shimgvw/res/rot2.bmp
similarity index 100%
rename from reactos/base/shell/shimgvw/res/rot2.bmp
rename to reactos/base/shell/shellext/shimgvw/res/rot2.bmp
diff --git a/reactos/base/shell/shimgvw/res/save.bmp b/reactos/base/shell/shellext/shimgvw/res/save.bmp
similarity index 100%
rename from reactos/base/shell/shimgvw/res/save.bmp
rename to reactos/base/shell/shellext/shimgvw/res/save.bmp
diff --git a/reactos/base/shell/shimgvw/res/zoomm.bmp b/reactos/base/shell/shellext/shimgvw/res/zoomm.bmp
similarity index 100%
rename from reactos/base/shell/shimgvw/res/zoomm.bmp
rename to reactos/base/shell/shellext/shimgvw/res/zoomm.bmp
diff --git a/reactos/base/shell/shimgvw/res/zoomp.bmp b/reactos/base/shell/shellext/shimgvw/res/zoomp.bmp
similarity index 100%
rename from reactos/base/shell/shimgvw/res/zoomp.bmp
rename to reactos/base/shell/shellext/shimgvw/res/zoomp.bmp
diff --git a/reactos/base/shell/shimgvw/resource.h b/reactos/base/shell/shellext/shimgvw/resource.h
similarity index 100%
rename from reactos/base/shell/shimgvw/resource.h
rename to reactos/base/shell/shellext/shimgvw/resource.h
diff --git a/reactos/base/shell/shimgvw/shimgvw.c b/reactos/base/shell/shellext/shimgvw/shimgvw.c
similarity index 100%
rename from reactos/base/shell/shimgvw/shimgvw.c
rename to reactos/base/shell/shellext/shimgvw/shimgvw.c
diff --git a/reactos/base/shell/shimgvw/shimgvw.h b/reactos/base/shell/shellext/shimgvw/shimgvw.h
similarity index 100%
rename from reactos/base/shell/shimgvw/shimgvw.h
rename to reactos/base/shell/shellext/shimgvw/shimgvw.h
diff --git a/reactos/base/shell/shimgvw/shimgvw.rc b/reactos/base/shell/shellext/shimgvw/shimgvw.rc
similarity index 100%
rename from reactos/base/shell/shimgvw/shimgvw.rc
rename to reactos/base/shell/shellext/shimgvw/shimgvw.rc
diff --git a/reactos/base/shell/shimgvw/shimgvw.spec b/reactos/base/shell/shellext/shimgvw/shimgvw.spec
similarity index 100%
rename from reactos/base/shell/shimgvw/shimgvw.spec
rename to reactos/base/shell/shellext/shimgvw/shimgvw.spec