added module_template; removed patches