Adds machines slot mapping to GUIs
Clean up wrapper duplicate files
Merge remote-tracking branch 'origin'