Refactoring to net.cubition.server