refactoring, made static classes static

this is my current try at our refactoring discussion earlier.