updated app folder structure

jira ticket:
no jira no