Finished app reorganization.

This fixes #16.