Restructure of the template directory. Template modified