Moved some classes to their own package