Reorganize App Managementadded more structure around the app tests