Updated templates, altered config structure