402.03 changed encoder usage; reorganized structs