Refactored controllers, updated dependencies.