Reorganised template directory.