Refactor packages, add examples