(#9) fix template arguments and file locations