Changed directories on client, parse out template names correctly