Modularization and documentation