[Modules] Refactorization going on.