refactor and change package name