Refactoring variable names
Moved all variables into the classes
Completed refactoring to class structure