MEDIUM / Refactored modules to fit in new architecture