Continuation of long-overdue modularization