Encoder is now a subsection, remove fxnote from decoder, rearrange the main structure