Replaced controllers to a new package.