Refactor code
Merge branch 'controller' of github.com:Downfy/Controller into controller