app is now modularized