Let's have the same folder structure for bs2 and bs3
Merge pull request #108 from Serhioromano/normalize-bs-file-structure

Let's have the same folder structure for bs2 and bs3