Core rearrange and decoder helper scripts
Merged pull