App structure makes a lot more sense like this.