2 Cometimentos (chore/restructure-decoder)