branching and a new package to organize code