1 Commity (chore/restructure-decoder)