project modularization reworked