Moved some classes around, fixed package names