Refactoring, split of code to eliminate full imports
Refactoring, split of code to eliminate full imports