added version suffix and use templates in sources