Removed extra classes in main library in exchange for importing the broken out library.