reorganize app to make more sense for multiple controllers