Renamed GatewayMessages to fix classpath issue