changed data structure

changed lists structure in data folder for better maintenance
Merge branch 'layouts-change' into gh-pages