reorganize files for style switch
pre complete switcher :)
refactor style-switcher, complete
Merge branch 'feature/style-switch' into develop