Fixed the bundle directories location
Merge branch 'fix-directories-structure'