Rebuilded project filesystem to look more like BEM