refactor packaging to make tests easier to see

some setup/config minor fixes encountered while testing
large refactoring + new functionality