Changed to structure off the app