refactoring related to change name of the main package