refactor package name + clean up