little adjustments
Moved templates into new directory