Refactor

* Use of modules && monkey patching
* REGEX update