Upgrading gen-idea
Code refactoring to use new package name