Move to workmachine namespace