begun porting to a package
packagizing things
Merge branch 'package'
setup fix