Update encoder package structure