Enhance modular structure by combining directive controllers with directives. Update LayoutCtrl for better naming of $scope objects