Refactored all the packages and classes to match the new name. Got rid
of all the static references.