[new] App Structure enhanced