Fixing imports and circular issue
Merge branch 'master' of github.com:sherifzain/cenergy_insights