Moved classes between packages for organizational purposes