Moved template files, updated configs