Re-structured some of the app skeleton.