Rearranged Program Setup

Program setup changed. All program code still there and works just as
well.