Removed circular module references.