New structure
Merge branch 'feature/carto-layers' into develop