Revamped/simplified app organization.