Code reorganization

Moved moderation to one controller