Minor progress with application organization