minor docs update and package refactoring