Cleanup & re-structure template
Cleanup & re-structure template

stefen/whoops,nonconforme/whoops,staabm/whoops,oligriffiths/whoops,UnderDogg/whoops,emilkje/whoops,oligriffiths/whoops,michabbb-backup/whoops,UnderDogg/whoops,stefen/whoops,michabbb-backup/whoops,Vmak11/whoops,nonconforme/whoops,Vmak11/whoops,emilkje/whoops,filp/whoops,filp/whoops,staabm/whoops