better directory structure [JIRA] (APPS-50)