Added bem-components and layout
Merged conflict