Restructure based on Yeoman template
Restructure based on Yeoman template