Moved some classes around, and made a wrapper class to simply some functions