When adding new rule, show the message we are parsing.

Also reorganized files.