big code refactor

moves constants to seperate classes
Merge pull request #340 from way2muchnoise/1.7-update

big code refactor