App boilerplate code. Small structure changes.