module dir structure now imitates app structure