gulp and architecture improvements