Rename style folder to css
Merge branch 'dev' into stage