added new dirs, updated template files