Refactoring of common modules.
Refactoring of common modules.