Change folder structure
Backbone updated