moved gateway class to includes folder