re-org of a lot of variables
Merge pull request #4 from selston69/master

re-org of a lot of variables