1 Commitit (chore/restructure-decoder)