Revert "Fixed bad order in with-module"

This reverts commit dd9b4c85e3fa918aa13d3100616b4ce5744c129c.
Added do-matching-command-handlers