WIP: Reorgination into multiple apps.