Restructure config and adjust transformers