Simplified to single "encoding" package