Reorder constants, channels instead of channels-file

Reorder constants, channels instead of channels-file #148