updated templates for sample21 and 25 also fixed basePath definition in sample21