working version of modularized project