move gate/ into gateway/