Revert "Move decoders to new decoders directory."

This reverts commit 31332b9706373539bda90f75b064bb37ad486fe3.