Huge refactoring in the module

Now all phases are being called. However we still don't have
intervention

Author: Felipe Zimmerle