Just moved some classes to make the package structure more obvious