Refactored directory structure so that all apps load from their own directory. Common resources
are drawn from 'common'
Continuing the refactor