house keeping, cleaning out root package
more package cleanup