Removed circular dependency and rebuilt documentation.