WIP: rename app to internal
a little cleanup and re-org