[Refactoring] Began with refactoring Import statement generation