updated component structure via generator
Merge branch 'dev'

* dev:
  updated component structure via generator