renamed some classes and variables
moved more constants