refactoring controller Core should work not tested

Signed-off-by: pussbb <pussbb@gmail.com>
bundle fix
Merge pull request #2 from pussbb/master

refactoring controller Core should work not tested