Moving Codecs into Cells, and general cleanup.