Modularization complete