Modularization and continued work