restructured app to make more sense