Restructuring  Frontend code
Merge branch 'master' into restyle