merge modularization efforts