5 Commits (chore/restructure-decoder)