Added refactoring modularization
Added refactoring modularization