Fixed references. Moved Gateway app to Examples folder