Fixing circular imports

https://www.pythonmorsels.com/fixing-circular-imports/