Refactor server client request classes into separate package.