Restructure with more templates