Changed file structure and the component identification.