Revert "Smarter separation of template"

This reverts commit 4f9072fdbc61b9ee9b2d67fd0285be64c7b0e2f6.
Fix Template