diff --git a/win32/epicmorg/prod/win10/Dockerfile b/win32/ecosystem/epicmorg/base/microsoft-windows-10/Dockerfile
similarity index 100%
rename from win32/epicmorg/prod/win10/Dockerfile
rename to win32/ecosystem/epicmorg/base/microsoft-windows-10/Dockerfile
diff --git a/win32/epicmorg/prod/win-server-core/Makefile b/win32/ecosystem/epicmorg/base/microsoft-windows-10/Makefile
similarity index 100%
rename from win32/epicmorg/prod/win-server-core/Makefile
rename to win32/ecosystem/epicmorg/base/microsoft-windows-10/Makefile
diff --git a/win32/epicmorg/prod/win10/README.md b/win32/ecosystem/epicmorg/base/microsoft-windows-10/README.md
similarity index 100%
rename from win32/epicmorg/prod/win10/README.md
rename to win32/ecosystem/epicmorg/base/microsoft-windows-10/README.md
diff --git a/win32/epicmorg/prod/win10/docker-compose.yml b/win32/ecosystem/epicmorg/base/microsoft-windows-10/docker-compose.yml
similarity index 100%
rename from win32/epicmorg/prod/win10/docker-compose.yml
rename to win32/ecosystem/epicmorg/base/microsoft-windows-10/docker-compose.yml
diff --git a/win32/epicmorg/prod/win-server-core/Dockerfile b/win32/ecosystem/epicmorg/base/microsoft-windows-servercore/Dockerfile
similarity index 100%
rename from win32/epicmorg/prod/win-server-core/Dockerfile
rename to win32/ecosystem/epicmorg/base/microsoft-windows-servercore/Dockerfile
diff --git a/win32/epicmorg/prod/win10/Makefile b/win32/ecosystem/epicmorg/base/microsoft-windows-servercore/Makefile
similarity index 100%
rename from win32/epicmorg/prod/win10/Makefile
rename to win32/ecosystem/epicmorg/base/microsoft-windows-servercore/Makefile
diff --git a/win32/epicmorg/prod/win-server-core/README.md b/win32/ecosystem/epicmorg/base/microsoft-windows-servercore/README.md
similarity index 100%
rename from win32/epicmorg/prod/win-server-core/README.md
rename to win32/ecosystem/epicmorg/base/microsoft-windows-servercore/README.md
diff --git a/win32/epicmorg/prod/win-server-core/docker-compose.yml b/win32/ecosystem/epicmorg/base/microsoft-windows-servercore/docker-compose.yml
similarity index 100%
rename from win32/epicmorg/prod/win-server-core/docker-compose.yml
rename to win32/ecosystem/epicmorg/base/microsoft-windows-servercore/docker-compose.yml