Fix remote components on Windows
Merge deployable components and adapt for Windows