Refactor routers out, reorganize modules.
Add reply field.