Refactor package name, organize imports