move template to correct folder .... too many small fixes, this day needs to be over