Merged with BEM project-stub
Restructure folder