minor cleaups, switch to package namespace, reduce dependencies

minor cleaups, switch to package namespace, reduce dependencies #146