Adepted the modules to their new structure

No match.