reorganized template directory