Changed file structure and the component identification.
Merge branch 'develop'