Restructured folder
Merge branch 'master' of https://github.com/freezedev/sunstone