Improve template and move to own folder

Then a beamer template can be added in a clean way in the other folder.