refactoring to use multiple controllers
added new controller
updated extensions
Merge pull request #6 from jangahroo/master

updates