Restructure the templates directories