Reorganized packages to follow a client/server organization.