Proper modularization