attempt fixing cycle import
restructure code / switch new module / lazy loading of choice inside init
restructure code / switch new module / lazy loading of choice inside init