Change Controller structure