moar modules, organization, and optimization