Deleted separate stack files - Put into main

Turns out you can't separate template files from main. Putting them back