Make GaiaApp whole Gaia, and WebApp just a single app