Refactor AddController package

Signed-off-by: Hui Zheng <fengyimzy@gmail.com>