Restructure generated app templates