Moved some imports to prevent potential circular dependencies in the future.