Organized the client side a bit.