Refactored controllers. fix #13