updated to work with top-level package name