refactor package name, implement simple decoder