organizing into one app