update to remove certain entities, moved templates to correct place