Refactor subclasses and variables

I want to keep all variables in the params class and
keep everything neat and tiday.