diff --git a/src/app/components/noosfero-activities/activities.component.js b/src/app/components/noosfero-activities/activities.component.js
new file mode 100644
index 0000000..8e73541
--- /dev/null
+++ b/src/app/components/noosfero-activities/activities.component.js
@@ -0,0 +1,14 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoActivities', {
+      restrict: 'E',
+      bindings: {
+          activities: '<'
+      },
+      templateUrl: 'app/components/noosfero-activities/activities.html'
+    });
+
+})();
diff --git a/src/app/components/noosfero-activities/activities.directive.js b/src/app/components/noosfero-activities/activities.directive.js
deleted file mode 100644
index f6ff82f..0000000
--- a/src/app/components/noosfero-activities/activities.directive.js
+++ /dev/null
@@ -1,20 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoActivities', noosferoActivities);
-
-  /** @ngInject */
-  function noosferoActivities() {
-    var directive = {
-      restrict: 'E',
-      scope: {
-          activities: '='
-      },
-      templateUrl: 'app/components/noosfero-activities/activities.html'
-    };
-    return directive;
-  }
-
-})();
diff --git a/src/app/components/noosfero-activities/activities.html b/src/app/components/noosfero-activities/activities.html
index c785ad7..878ce7f 100644
--- a/src/app/components/noosfero-activities/activities.html
+++ b/src/app/components/noosfero-activities/activities.html
@@ -1,5 +1,5 @@
 <timeline>
-  <timeline-event ng-repeat="activity in activities | orderBy: 'created_at':true">
+  <timeline-event ng-repeat="activity in $ctrl.activities | orderBy: 'created_at':true">
     <noosfero-activity activity="activity"></noosfero-activity>
   </timeline-event>
 </timeline>
diff --git a/src/app/components/noosfero-activities/activity/activity.component.js b/src/app/components/noosfero-activities/activity/activity.component.js
new file mode 100644
index 0000000..1a431b0
--- /dev/null
+++ b/src/app/components/noosfero-activities/activity/activity.component.js
@@ -0,0 +1,24 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoActivity', {
+      restrict: 'E',
+      bindings: {
+          activity: '<'
+      },
+      templateUrl: 'app/components/noosfero-activities/activity/activity.html',
+      replace: true,
+      controller: ActivityController
+    });
+
+  /** @ngInject */
+  function ActivityController() {
+    var vm = this;
+    vm.getActivityTemplate = function(activity) {
+      return 'app/components/noosfero-activities/activity/' + activity.verb + '.html';
+    }
+  }
+
+})();
diff --git a/src/app/components/noosfero-activities/activity/activity.directive.js b/src/app/components/noosfero-activities/activity/activity.directive.js
deleted file mode 100644
index 0d2583e..0000000
--- a/src/app/components/noosfero-activities/activity/activity.directive.js
+++ /dev/null
@@ -1,32 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoActivity', noosferoActivity);
-
-  /** @ngInject */
-  function noosferoActivity() {
-    var directive = {
-      restrict: 'E',
-      scope: {
-          activity: '='
-      },
-      templateUrl: 'app/components/noosfero-activities/activity/activity.html',
-      replace: true,
-      controller: ActivityController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-    return directive;
-
-    /** @ngInject */
-    function ActivityController() {
-      var vm = this;
-      vm.getActivityTemplate = function(activity) {
-        return 'app/components/noosfero-activities/activity/' + activity.verb + '.html';
-      }
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero-activities/activity/activity.html b/src/app/components/noosfero-activities/activity/activity.html
index 63eb36b..2e266ea 100644
--- a/src/app/components/noosfero-activities/activity/activity.html
+++ b/src/app/components/noosfero-activities/activity/activity.html
@@ -1,3 +1,3 @@
 <div class="activity">
-  <ng-include src="vm.getActivityTemplate(vm.activity)"></ng-include>
+  <ng-include src="$ctrl.getActivityTemplate($ctrl.activity)"></ng-include>
 </div>
diff --git a/src/app/components/noosfero-activities/activity/add_member_in_community.html b/src/app/components/noosfero-activities/activity/add_member_in_community.html
index 5cff42b..3f9c436 100644
--- a/src/app/components/noosfero-activities/activity/add_member_in_community.html
+++ b/src/app/components/noosfero-activities/activity/add_member_in_community.html
@@ -4,10 +4,10 @@
 <timeline-panel>
   <timeline-heading>
     <h4 class="timeline-title">
-      <a ui-sref="main.profile.info({profile: vm.activity.user.identifier})"><strong ng-bind="vm.activity.user.name"></strong></a>
+      <a ui-sref="main.profile.info({profile: $ctrl.activity.user.identifier})"><strong ng-bind="$ctrl.activity.user.name"></strong></a>
       <span> has joined the community</span>
     </h4>
-    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="vm.activity.created_at"></span></small></p>
+    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="$ctrl.activity.created_at"></span></small></p>
   </timeline-heading>
   <div class="timeline-body"></div>
 </timeline-panel>
diff --git a/src/app/components/noosfero-activities/activity/create_article.html b/src/app/components/noosfero-activities/activity/create_article.html
index 0459d9e..f2ff140 100644
--- a/src/app/components/noosfero-activities/activity/create_article.html
+++ b/src/app/components/noosfero-activities/activity/create_article.html
@@ -4,22 +4,22 @@
 <timeline-panel>
   <timeline-heading>
     <h4 class="timeline-title">
-      <a ui-sref="main.profile.info({profile: vm.activity.user.identifier})"><strong ng-bind="vm.activity.user.name"></strong></a>
+      <a ui-sref="main.profile.info({profile: $ctrl.activity.user.identifier})"><strong ng-bind="$ctrl.activity.user.name"></strong></a>
       <span> has published on </span>
-      <a ui-sref="main.profile.info({profile: vm.activity.target.article.profile.identifier})">
-        <strong ng-bind="vm.activity.target.article.profile.name"></strong></span>
+      <a ui-sref="main.profile.info({profile: $ctrl.activity.target.article.profile.identifier})">
+        <strong ng-bind="$ctrl.activity.target.article.profile.name"></strong></span>
       </a>
     </h4>
-    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="vm.activity.created_at"></span></small></p>
+    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="$ctrl.activity.created_at"></span></small></p>
   </timeline-heading>
   <div class="timeline-body">
     <div class="article">
       <div class="title">
-        <a ui-sref="main.profile.page({profile: vm.activity.target.article.profile.identifier, page: vm.activity.target.article.path})"
-           ng-bind="vm.activity.target.article.title"></a>
+        <a ui-sref="main.profile.page({profile: $ctrl.activity.target.article.profile.identifier, page: $ctrl.activity.target.article.path})"
+           ng-bind="$ctrl.activity.target.article.title"></a>
       </div>
       <div class="lead small">
-        <div ng-bind-html="vm.activity.target.article.body | stripTags | truncate: 100 : '...': true"></div>
+        <div ng-bind-html="$ctrl.activity.target.article.body | stripTags | truncate: 100 : '...': true"></div>
       </div>
     </div>
   </div>
diff --git a/src/app/components/noosfero-activities/activity/new_friendship.html b/src/app/components/noosfero-activities/activity/new_friendship.html
index b8730d1..0916deb 100644
--- a/src/app/components/noosfero-activities/activity/new_friendship.html
+++ b/src/app/components/noosfero-activities/activity/new_friendship.html
@@ -4,15 +4,15 @@
 <timeline-panel>
   <timeline-heading>
     <h4 class="timeline-title">
-      <a ui-sref="main.profile.info({profile: vm.activity.user.identifier})"><strong ng-bind="vm.activity.user.name"></strong></a>
-      <span> has made <span ng-bind="vm.activity.params.friend_name.length"></span> new friend(s): </span>
+      <a ui-sref="main.profile.info({profile: $ctrl.activity.user.identifier})"><strong ng-bind="$ctrl.activity.user.name"></strong></a>
+      <span> has made <span ng-bind="$ctrl.activity.params.friend_name.length"></span> new friend(s): </span>
       <span class="comma-separated">
-        <a class="separated-item" ui-sref="main.profile.info({profile: vm.activity.params.friend_url[$index].profile})" ng-repeat="friend in vm.activity.params.friend_name">
+        <a class="separated-item" ui-sref="main.profile.info({profile: $ctrl.activity.params.friend_url[$index].profile})" ng-repeat="friend in $ctrl.activity.params.friend_name">
           <strong ng-bind="friend"></strong>
         </a>
       </span>
     </h4>
-    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="vm.activity.created_at"></span></small></p>
+    <p><small class="text-muted"><i class="fa fa-clock-o"></i> <span am-time-ago="$ctrl.activity.created_at"></span></small></p>
   </timeline-heading>
   <div class="timeline-body"></div>
 </timeline-panel>
diff --git a/src/app/components/noosfero-articles/article/article.directive.js b/src/app/components/noosfero-articles/article/article.directive.js
index 07f780a..b702424 100644
--- a/src/app/components/noosfero-articles/article/article.directive.js
+++ b/src/app/components/noosfero-articles/article/article.directive.js
@@ -11,8 +11,8 @@
       restrict: 'E',
       templateUrl: 'app/components/noosfero-articles/article/article.html',
       scope: {
-          article: '=',
-          profile: '='
+          article: '<',
+          profile: '<'
       },
       controller: ArticleController,
       controllerAs: 'vm',
diff --git a/src/app/components/noosfero-articles/blog/blog.component.js b/src/app/components/noosfero-articles/blog/blog.component.js
new file mode 100644
index 0000000..f9ab59b
--- /dev/null
+++ b/src/app/components/noosfero-articles/blog/blog.component.js
@@ -0,0 +1,36 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoBlog', {
+      restrict: 'E',
+      templateUrl: 'app/components/noosfero-articles/blog/blog.html',
+      bindings: {
+          article: '<',
+          profile: '<'
+      },
+      controller: BlogController
+    });
+
+  /** @ngInject */
+  function BlogController(noosfero) {
+    var vm = this;
+    vm.posts = [];
+    vm.perPage = 3;
+    vm.currentPage = 1;
+
+    vm.loadPage = function() {
+      noosfero.articles.one(vm.article.id).customGET('children', {
+        content_type: 'TinyMceArticle',
+        per_page: vm.perPage,
+        page: vm.currentPage
+      }).then(function(response) {
+        vm.totalPosts = response.headers('total');
+        vm.posts = response.data.articles;
+      });
+    }
+    vm.loadPage();
+  }
+
+})();
diff --git a/src/app/components/noosfero-articles/blog/blog.directive.js b/src/app/components/noosfero-articles/blog/blog.directive.js
deleted file mode 100644
index 26b91bd..0000000
--- a/src/app/components/noosfero-articles/blog/blog.directive.js
+++ /dev/null
@@ -1,45 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoBlog', noosferoBlog);
-
-  /** @ngInject */
-  function noosferoBlog() {
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-articles/blog/blog.html',
-      scope: {
-          article: '=',
-          profile: '='
-      },
-      controller: BlogController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function BlogController(noosfero) {
-      var vm = this;
-      vm.posts = [];
-      vm.perPage = 3;
-      vm.currentPage = 1;
-
-      vm.loadPage = function() {
-        noosfero.articles.one(vm.article.id).customGET('children', {
-          content_type: 'TinyMceArticle',
-          per_page: vm.perPage,
-          page: vm.currentPage
-        }).then(function(response) {
-          vm.totalPosts = response.headers('total');
-          vm.posts = response.data.articles;
-        });
-      }
-      vm.loadPage();
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero-articles/blog/blog.html b/src/app/components/noosfero-articles/blog/blog.html
index d4c1beb..e4941b2 100644
--- a/src/app/components/noosfero-articles/blog/blog.html
+++ b/src/app/components/noosfero-articles/blog/blog.html
@@ -1,24 +1,24 @@
 <div class="blog">
-  <div class="blog-cover" ng-show="vm.article.image">
-    <img ng-src="{{vm.article.image.url}}" class="img-responsive">
-    <h3 ng-bind="vm.article.title"></h3>
+  <div class="blog-cover" ng-show="$ctrl.article.image">
+    <img ng-src="{{$ctrl.article.image.url}}" class="img-responsive">
+    <h3 ng-bind="$ctrl.article.title"></h3>
   </div>
 
-  <div class="page-header" ng-show="!vm.article.image">
-    <h3 ng-bind="vm.article.title"></h3>
+  <div class="page-header" ng-show="!$ctrl.article.image">
+    <h3 ng-bind="$ctrl.article.title"></h3>
   </div>
 
   <div>
-    <div ng-repeat="child in vm.posts | orderBy: 'created_at':true">
+    <div ng-repeat="child in $ctrl.posts | orderBy: 'created_at':true">
       <div class="page-header">
-        <a class="title" ui-sref="main.profile.page({profile: vm.profile.identifier, page: child.path})"><h4 ng-bind="child.title"></h4></a>
+        <a class="title" ui-sref="main.profile.page({profile: $ctrl.profile.identifier, page: child.path})"><h4 ng-bind="child.title"></h4></a>
         <div class="post-lead" ng-bind-html="child.body | truncate: 500: '...': true"></div>
       </div>
     </div>
   </div>
 
-  <pagination ng-model="vm.currentPage" total-items="vm.totalPosts" class="pagination-sm center-block"
-    boundary-links="true" items-per-page="vm.perPage" ng-change="vm.loadPage()"
+  <pagination ng-model="$ctrl.currentPage" total-items="$ctrl.totalPosts" class="pagination-sm center-block"
+    boundary-links="true" items-per-page="$ctrl.perPage" ng-change="$ctrl.loadPage()"
     first-text="«" last-text="»" previous-text="‹" next-text="›">
   </pagination>
 </div>
diff --git a/src/app/components/noosfero-blocks/block.directive.js b/src/app/components/noosfero-blocks/block.directive.js
index e6e8913..ac6b365 100644
--- a/src/app/components/noosfero-blocks/block.directive.js
+++ b/src/app/components/noosfero-blocks/block.directive.js
@@ -10,8 +10,8 @@
     var directive = {
       restrict: 'E',
       scope: {
-          block: '=',
-          owner: '='
+          block: '<',
+          owner: '<'
       },
       link: function(scope, element) {
         var blockName = scope.block.type.replace(/([a-z])([A-Z])/g, '$1-$2').toLowerCase();
diff --git a/src/app/components/noosfero-blocks/link-list/link-list.component.js b/src/app/components/noosfero-blocks/link-list/link-list.component.js
new file mode 100644
index 0000000..8dd0fdb
--- /dev/null
+++ b/src/app/components/noosfero-blocks/link-list/link-list.component.js
@@ -0,0 +1,21 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoLinkListBlock', {
+      restrict: 'E',
+      templateUrl: 'app/components/noosfero-blocks/link-list/link-list.html',
+      bindings: {
+          block: '<',
+          owner: '<'
+      },
+      controller: LinkListBlockController
+    });
+
+  /** @ngInject */
+  function LinkListBlockController() {
+    this.links = this.block.settings.links;
+  }
+
+})();
diff --git a/src/app/components/noosfero-blocks/link-list/link-list.directive.js b/src/app/components/noosfero-blocks/link-list/link-list.directive.js
deleted file mode 100644
index 25cfe29..0000000
--- a/src/app/components/noosfero-blocks/link-list/link-list.directive.js
+++ /dev/null
@@ -1,31 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoLinkListBlock', noosferoLinkListBlock);
-
-  /** @ngInject */
-  function noosferoLinkListBlock() {
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-blocks/link-list/link-list.html',
-      scope: {
-          block: '=',
-          owner: '='
-      },
-      controller: LinkListBlockController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function LinkListBlockController() {
-      var vm = this;
-      vm.links = vm.block.settings.links;
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero-blocks/link-list/link-list.html b/src/app/components/noosfero-blocks/link-list/link-list.html
index 327bb37..7915222 100644
--- a/src/app/components/noosfero-blocks/link-list/link-list.html
+++ b/src/app/components/noosfero-blocks/link-list/link-list.html
@@ -1,6 +1,6 @@
 <div class="link-list-block">
-  <div ng-repeat="link in vm.links">
-    <a ng-href="{{link.address | noosferoTemplateFilter:{profile: vm.owner.identifier} }}">
+  <div ng-repeat="link in $ctrl.links">
+    <a ng-href="{{link.address | noosferoTemplateFilter:{profile: $ctrl.owner.identifier} }}">
       <i class="fa fa-fw icon-{{link.icon}}"></i> <span>{{link.name}}</span>
     </a>
   </div>
diff --git a/src/app/components/noosfero-blocks/main-block/main-block.component.js b/src/app/components/noosfero-blocks/main-block/main-block.component.js
new file mode 100644
index 0000000..45ca550
--- /dev/null
+++ b/src/app/components/noosfero-blocks/main-block/main-block.component.js
@@ -0,0 +1,20 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoMainBlock', {
+      restrict: 'E',
+      templateUrl: 'app/components/noosfero-blocks/main-block/main-block.html',
+      bindings: {
+          block: '<',
+          owner: '<'
+      },
+      controller: MainBlockController
+    });
+
+  /** @ngInject */
+  function MainBlockController() {
+  }
+
+})();
diff --git a/src/app/components/noosfero-blocks/main-block/main-block.directive.js b/src/app/components/noosfero-blocks/main-block/main-block.directive.js
deleted file mode 100644
index 9b0c58c..0000000
--- a/src/app/components/noosfero-blocks/main-block/main-block.directive.js
+++ /dev/null
@@ -1,29 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoMainBlock', noosferoMainBlock);
-
-  /** @ngInject */
-  function noosferoMainBlock() {
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-blocks/main-block/main-block.html',
-      scope: {
-          block: '=',
-          owner: '='
-      },
-      controller: MainBlockController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function MainBlockController() {
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero-blocks/members-block/members-block.component.js b/src/app/components/noosfero-blocks/members-block/members-block.component.js
new file mode 100644
index 0000000..c1ddafb
--- /dev/null
+++ b/src/app/components/noosfero-blocks/members-block/members-block.component.js
@@ -0,0 +1,26 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoMembersBlock', {
+      restrict: 'E',
+      templateUrl: 'app/components/noosfero-blocks/members-block/members-block.html',
+      bindings: {
+          block: '<',
+          owner: '<'
+      },
+      controller: MembersBlockController
+    });
+
+  /** @ngInject */
+  function MembersBlockController(noosfero) {
+    var vm = this;
+    vm.members = [];
+
+    noosfero.members(noosfero.profiles.one(vm.owner.id)).one().get({per_page: 6}).then(function(response) {
+      vm.members = response.data.people;
+    });
+  }
+
+})();
diff --git a/src/app/components/noosfero-blocks/members-block/members-block.directive.js b/src/app/components/noosfero-blocks/members-block/members-block.directive.js
deleted file mode 100644
index d07835a..0000000
--- a/src/app/components/noosfero-blocks/members-block/members-block.directive.js
+++ /dev/null
@@ -1,35 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoMembersBlock', noosferoMembersBlock);
-
-  /** @ngInject */
-  function noosferoMembersBlock() {
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-blocks/members-block/members-block.html',
-      scope: {
-          block: '=',
-          owner: '='
-      },
-      controller: MembersBlockController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function MembersBlockController(noosfero) {
-      var vm = this;
-      vm.members = [];
-
-      noosfero.members(noosfero.profiles.one(vm.owner.id)).one().get({per_page: 6}).then(function(response) {
-        vm.members = response.data.people;
-      });
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero-blocks/members-block/members-block.html b/src/app/components/noosfero-blocks/members-block/members-block.html
index c9df538..5aac3bd 100644
--- a/src/app/components/noosfero-blocks/members-block/members-block.html
+++ b/src/app/components/noosfero-blocks/members-block/members-block.html
@@ -1,5 +1,5 @@
 <div class="members-block">
-  <a ng-repeat="member in vm.members" ui-sref="main.profile({profile: member.identifier})" class="member">
+  <a ng-repeat="member in $ctrl.members" ui-sref="main.profile({profile: member.identifier})" class="member">
     <noosfero-profile-image profile="member"></noosfero-profile-image>
   </a>
 </div>
diff --git a/src/app/components/noosfero-blocks/profile-image/profile-image.component.js b/src/app/components/noosfero-blocks/profile-image/profile-image.component.js
new file mode 100644
index 0000000..5b76aeb
--- /dev/null
+++ b/src/app/components/noosfero-blocks/profile-image/profile-image.component.js
@@ -0,0 +1,22 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoProfileImageBlock', {
+      restrict: 'E',
+      templateUrl: 'app/components/noosfero-blocks/profile-image/profile-image.html',
+      bindings: {
+          block: '<',
+          owner: '<'
+      },
+      controller: ProfileImageBlockController
+    });
+
+  /** @ngInject */
+  function ProfileImageBlockController() {
+    var vm = this;
+    vm.profile = vm.owner;
+  }
+
+})();
diff --git a/src/app/components/noosfero-blocks/profile-image/profile-image.directive.js b/src/app/components/noosfero-blocks/profile-image/profile-image.directive.js
deleted file mode 100644
index 467ba9e..0000000
--- a/src/app/components/noosfero-blocks/profile-image/profile-image.directive.js
+++ /dev/null
@@ -1,31 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoProfileImageBlock', noosferoProfileImageBlock);
-
-  /** @ngInject */
-  function noosferoProfileImageBlock() {
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-blocks/profile-image/profile-image.html',
-      scope: {
-          block: '=',
-          owner: '='
-      },
-      controller: ProfileImageBlockController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function ProfileImageBlockController() {
-      var vm = this;
-      vm.profile = vm.owner;
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero-blocks/profile-image/profile-image.html b/src/app/components/noosfero-blocks/profile-image/profile-image.html
index 3636a39..d7860da 100644
--- a/src/app/components/noosfero-blocks/profile-image/profile-image.html
+++ b/src/app/components/noosfero-blocks/profile-image/profile-image.html
@@ -1,6 +1,6 @@
 <div class="center-block text-center profile-image-block">
-  <a ui-sref="main.profile.info({profile: vm.owner.identifier})">
-    <noosfero-profile-image profile="vm.owner"></noosfero-profile-image>
+  <a ui-sref="main.profile.info({profile: $ctrl.owner.identifier})">
+    <noosfero-profile-image profile="$ctrl.owner"></noosfero-profile-image>
   </a>
-  <a class="settings-link" target="_self" ui-sref="main.profile.settings({profile: vm.owner.identifier})">Control panel</a>
+  <a class="settings-link" target="_self" ui-sref="main.profile.settings({profile: $ctrl.owner.identifier})">Control panel</a>
 </div>
diff --git a/src/app/components/noosfero-blocks/recent-documents/recent-documents.component.js b/src/app/components/noosfero-blocks/recent-documents/recent-documents.component.js
new file mode 100644
index 0000000..5a864d2
--- /dev/null
+++ b/src/app/components/noosfero-blocks/recent-documents/recent-documents.component.js
@@ -0,0 +1,33 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoRecentDocumentsBlock', {
+      restrict: 'E',
+      templateUrl: 'app/components/noosfero-blocks/recent-documents/recent-documents.html',
+      bindings: {
+          block: '<',
+          owner: '<'
+      },
+      controller: RecentDocumentsController
+    });
+
+  /** @ngInject */
+  function RecentDocumentsController(noosfero, $state) {
+    var vm = this;
+    vm.profile = vm.owner;
+    vm.documents = [];
+
+    vm.openDocument = function(article) {
+      $state.go("main.profile.page", {page: article.path, profile: article.profile.identifier}); 
+    }
+
+    var limit = vm.block.settings.limit || 5;
+    //FIXME get all text articles
+    noosfero.profiles.one(vm.profile.id).one('articles').get({content_type: 'TinyMceArticle', per_page: limit}).then(function(response) {
+      vm.documents = response.data.articles;
+    });
+  }
+
+})();
diff --git a/src/app/components/noosfero-blocks/recent-documents/recent-documents.directive.js b/src/app/components/noosfero-blocks/recent-documents/recent-documents.directive.js
deleted file mode 100644
index 2106893..0000000
--- a/src/app/components/noosfero-blocks/recent-documents/recent-documents.directive.js
+++ /dev/null
@@ -1,42 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoRecentDocumentsBlock', noosferoRecentDocumentsBlock);
-
-  /** @ngInject */
-  function noosferoRecentDocumentsBlock() {
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero-blocks/recent-documents/recent-documents.html',
-      scope: {
-          block: '=',
-          owner: '='
-      },
-      controller: RecentDocumentsController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function RecentDocumentsController(noosfero, $state) {
-      var vm = this;
-      vm.profile = vm.owner;
-      vm.documents = [];
-
-      vm.openDocument = function(article) {
-        $state.go("main.profile.page", {page: article.path, profile: article.profile.identifier}); 
-      }
-
-      var limit = vm.block.settings.limit || 5;
-      //FIXME get all text articles
-      noosfero.profiles.one(vm.profile.id).one('articles').get({content_type: 'TinyMceArticle', per_page: limit}).then(function(response) {
-        vm.documents = response.data.articles;
-      });
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero-blocks/recent-documents/recent-documents.html b/src/app/components/noosfero-blocks/recent-documents/recent-documents.html
index a023619..84afdf1 100644
--- a/src/app/components/noosfero-blocks/recent-documents/recent-documents.html
+++ b/src/app/components/noosfero-blocks/recent-documents/recent-documents.html
@@ -1,5 +1,5 @@
-<div deckgrid source="vm.documents" class="deckgrid">
-  <div class="a-card panel media" ng-click="mother.vm.openDocument(card);">
+<div deckgrid source="$ctrl.documents" class="deckgrid">
+  <div class="a-card panel media" ng-click="mother.$ctrl.openDocument(card);">
       <div class="author media-left" ng-show="card.author.image">
         <img ng-src="{{card.author.image.url}}" class="img-circle">
       </div>
diff --git a/src/app/components/noosfero-boxes/box.html b/src/app/components/noosfero-boxes/box.html
index 9e2ec64..f1fe26f 100644
--- a/src/app/components/noosfero-boxes/box.html
+++ b/src/app/components/noosfero-boxes/box.html
@@ -4,7 +4,7 @@
       <h3 class="panel-title">{{block.title}}</h3>
     </div>
     <div class="panel-body">
-      <noosfero-block block="block" owner="vm.owner"></noosfero-block>
+      <noosfero-block block="block" owner="$ctrl.owner"></noosfero-block>
     </div>
   </div>
 </div>
diff --git a/src/app/components/noosfero-boxes/boxes.component.js b/src/app/components/noosfero-boxes/boxes.component.js
new file mode 100644
index 0000000..abefbfc
--- /dev/null
+++ b/src/app/components/noosfero-boxes/boxes.component.js
@@ -0,0 +1,26 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoBoxes', {
+      restrict: 'E',
+      bindings: {
+          boxes: '<',
+          owner: '<'
+      },
+      templateUrl: 'app/components/noosfero-boxes/boxes.html',
+      controller: BoxesController
+    });
+
+  /** @ngInject */
+  function BoxesController() {
+    var vm = this;
+
+    vm.boxesOrder = function(box) {
+      if(box.position==2) return 0;
+      return box.position;
+    }
+  }
+
+})();
diff --git a/src/app/components/noosfero-boxes/boxes.directive.js b/src/app/components/noosfero-boxes/boxes.directive.js
deleted file mode 100644
index 519598f..0000000
--- a/src/app/components/noosfero-boxes/boxes.directive.js
+++ /dev/null
@@ -1,35 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoBoxes', noosferoBoxes);
-
-  /** @ngInject */
-  function noosferoBoxes() {
-    var directive = {
-      restrict: 'E',
-      scope: {
-          boxes: '=',
-          owner: '='
-      },
-      templateUrl: 'app/components/noosfero-boxes/boxes.html',
-      controller: BoxesController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function BoxesController() {
-      var vm = this;
-
-      vm.boxesOrder = function(box) {
-        if(box.position==2) return 0;
-        return box.position;
-      }
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero-boxes/boxes.html b/src/app/components/noosfero-boxes/boxes.html
index c40cb87..219b148 100644
--- a/src/app/components/noosfero-boxes/boxes.html
+++ b/src/app/components/noosfero-boxes/boxes.html
@@ -1 +1 @@
-<ng-include ng-repeat="box in vm.boxes | orderBy: vm.boxesOrder" src="'app/components/noosfero-boxes/box.html'"></ng-include>
+<ng-include ng-repeat="box in $ctrl.boxes | orderBy: $ctrl.boxesOrder" src="'app/components/noosfero-boxes/box.html'"></ng-include>
diff --git a/src/app/components/noosfero/profile-image/profile-image.component.js b/src/app/components/noosfero/profile-image/profile-image.component.js
new file mode 100644
index 0000000..9dd34bd
--- /dev/null
+++ b/src/app/components/noosfero/profile-image/profile-image.component.js
@@ -0,0 +1,22 @@
+(function() {
+  'use strict';
+
+  angular
+    .module('angular')
+    .component('noosferoProfileImage', {
+      restrict: 'E',
+      templateUrl: 'app/components/noosfero/profile-image/profile-image.html',
+      bindings: {
+        profile: '<'
+      },
+      controller: ProfileImageController
+    });
+
+  /** @ngInject */
+  function ProfileImageController() {
+    var vm = this;
+    vm.defaultIcon = 'fa-users';
+    if(vm.profile && vm.profile.type==='Person') vm.defaultIcon = 'fa-user';
+  }
+
+})();
diff --git a/src/app/components/noosfero/profile-image/profile-image.directive.js b/src/app/components/noosfero/profile-image/profile-image.directive.js
deleted file mode 100644
index 2603ca6..0000000
--- a/src/app/components/noosfero/profile-image/profile-image.directive.js
+++ /dev/null
@@ -1,31 +0,0 @@
-(function() {
-  'use strict';
-
-  angular
-    .module('angular')
-    .directive('noosferoProfileImage', noosferoProfileImage);
-
-  /** @ngInject */
-  function noosferoProfileImage() {
-    var directive = {
-      restrict: 'E',
-      templateUrl: 'app/components/noosfero/profile-image/profile-image.html',
-      scope: {
-        profile: '='
-      },
-      controller: ProfileImageController,
-      controllerAs: 'vm',
-      bindToController: true
-    };
-
-    return directive;
-
-    /** @ngInject */
-    function ProfileImageController() {
-      var vm = this;
-      vm.defaultIcon = 'fa-users';
-      if(vm.profile && vm.profile.type==='Person') vm.defaultIcon = 'fa-user';
-    }
-  }
-
-})();
diff --git a/src/app/components/noosfero/profile-image/profile-image.html b/src/app/components/noosfero/profile-image/profile-image.html
index 5bea666..a166548 100644
--- a/src/app/components/noosfero/profile-image/profile-image.html
+++ b/src/app/components/noosfero/profile-image/profile-image.html
@@ -1,4 +1,4 @@
-<span title="{{vm.profile.name}}">
-  <img ng-if="vm.profile.image" ng-src="{{vm.profile.image.url}}" class="img-responsive profile-image">
-  <i ng-if="!vm.profile.image" class="fa {{vm.defaultIcon}} fa-5x profile-image"></i>
+<span title="{{$ctrl.profile.name}}">
+  <img ng-if="$ctrl.profile.image" ng-src="{{$ctrl.profile.image.url}}" class="img-responsive profile-image">
+  <i ng-if="!$ctrl.profile.image" class="fa {{$ctrl.defaultIcon}} fa-5x profile-image"></i>
 </span>
--
libgit2 0.21.2