Moved some classes and made it prettier