Tidied up app structure.