refactoring package loading
refactoring package loading
fixed conflict