Making all of the static methods get called in a truly static way
Renaming the classes properly :P