File structure updated
Merge branch 'develop'

* develop:
  File structure updated