refactoring template, adding project and geo_loc