Reorganize lib/templates folder