So you moved the imports to the bottom to avoid a circular dependency?