Refactorize Modules