further clean up code and use new simple package name