Refactoring package structure
Adding nb context