changing refactor a little
user facing code in the binary package, app specific code in the pkg dir