Preparing for proper modularization