Resolved circular dependencies.

Added Client/Server classes.