diff --git a/plugins/mezuro/features/call_monkey_server.sh b/plugins/mezuro/features/call_monkey_server.sh
deleted file mode 100644
index d76141a..0000000
--- a/plugins/mezuro/features/call_monkey_server.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-MONKEY_SERVER_ADDRESS="localhost"
-MONKEY_SERVER_PORT=50688
-
-# Ignore errors from all commands
-trap "" ERR
-
-exec 5<>/dev/tcp/$MONKEY_SERVER_ADDRESS/$MONKEY_SERVER_PORT
-echo "SCENARIO $1" >&5
-echo "Calling monkey-server in Scenario $1"
diff --git a/plugins/mezuro/features/creating_project.feature b/plugins/mezuro/features/creating_project.feature
deleted file mode 100644
index c226287..0000000
--- a/plugins/mezuro/features/creating_project.feature
+++ /dev/null
@@ -1,65 +0,0 @@
-@mezuro
-Feature: Create project
-  As a mezuro user
-  I want to create a Mezuro project
-
-  Background:
-    Given the following users
-      | login     | name       |
-      | joaosilva | Joao Silva |
-    And I am logged in as "joaosilva"
-    And "Mezuro" plugin is enabled
-    And the following community
-      | identifier  | name         |
-      | mycommunity | My Community |
-    And "Joao Silva" is admin of "My Community"
-
-  Scenario: I see Mezuro project's input form
-    Given I am on mycommunity's control panel
-    When I follow "Mezuro project"
-    Then I should see "Title"
-    And I should see "Description"
-
-  Scenario: I create a Mezuro project with valid attributes
-    Given I am on mycommunity's control panel
-    When I create a Mezuro project with the following data
-      | Title           | Sample Project      |
-      | Description     | Sample Description  |
-    Then I should see "Sample Project"
-    And I should see "Sample Description"
-    And I should see "Add Repository"
-
-	@selenium
-	Scenario: I edit a Mezuro project
-    Given I am on mycommunity's control panel
-    When I create a Mezuro project with the following data
-      | Title           | Sample Project      |
-      | Description     | Sample Description  |
-		And I am on article "Sample Project"
-		And I should be on /mycommunity/sample-project
-		When I follow "Edit"
-		
-	@selenium
-	Scenario: I delete a Mezuro project that belongs to me
-		Given the following Mezuro project
-      | name               | description         | owner    |
-      | Sample Project     | Sample Description  | joaosilva |
-		And I am on article "Sample Project"
-		And I should be on /joaosilva/sample-project
-		When I follow "Delete"
-		And I confirm the "Are you sure that you want to remove the item "Sample Project"?" dialog
-		Then I go to /joaosilva/sample-project
-		And I should see "There is no such page: /joaosilva/sample-project"
-		
-  @selenium
-	Scenario: I cannot delete a Mezuro project that doesn't belong to me
-		Given the following Mezuro project
-      | name               | description         | owner    |
-      | Sample Project     | Sample Description  | joaosilva |
-		And I am on article "Sample Project"
-		And I should be on /joaosilva/sample-project
-		When I follow "Delete"
-		And I confirm the "Are you sure that you want to remove the item "Sample Project"?" dialog
-		Then I go to /joaosilva/sample-project
-		And I should see "There is no such page: /joaosilva/sample-project"
-		
diff --git a/plugins/mezuro/features/project.feature b/plugins/mezuro/features/project.feature
new file mode 100644
index 0000000..23ff028
--- /dev/null
+++ b/plugins/mezuro/features/project.feature
@@ -0,0 +1,65 @@
+@mezuro
+Feature: Project
+  As a mezuro user
+  I want to create, edit and remove a Mezuro project
+
+  Background:
+    Given the following users
+      | login     | name       |
+      | joaosilva | Joao Silva |
+    And I am logged in as "joaosilva"
+    And "Mezuro" plugin is enabled
+    And the following community
+      | identifier  | name         |
+      | mycommunity | My Community |
+    And "Joao Silva" is admin of "My Community"
+
+  Scenario: I see Mezuro project's input form
+    Given I am on mycommunity's control panel
+    When I follow "Mezuro project"
+    Then I should see "Title"
+    And I should see "Description"
+
+  Scenario: I create a Mezuro project with valid attributes
+    Given I am on mycommunity's control panel
+    When I create a Mezuro project with the following data
+      | Title           | Sample Project      |
+      | Description     | Sample Description  |
+    Then I should see "Sample Project"
+    And I should see "Sample Description"
+    And I should see "Add Repository"
+
+	@selenium
+	Scenario: I edit a Mezuro project
+    Given I am on mycommunity's control panel
+    When I create a Mezuro project with the following data
+      | Title           | Sample Project      |
+      | Description     | Sample Description  |
+		And I am on article "Sample Project"
+		And I should be on /mycommunity/sample-project
+		When I follow "Edit"
+		
+	@selenium
+	Scenario: I delete a Mezuro project that belongs to me
+		Given the following Mezuro project
+      | name               | description         | owner    |
+      | Sample Project     | Sample Description  | joaosilva |
+		And I am on article "Sample Project"
+		And I should be on /joaosilva/sample-project
+		When I follow "Delete"
+		And I confirm the "Are you sure that you want to remove the item "Sample Project"?" dialog
+		Then I go to /joaosilva/sample-project
+		And I should see "There is no such page: /joaosilva/sample-project"
+		
+  @selenium
+	Scenario: I cannot delete a Mezuro project that doesn't belong to me
+		Given the following Mezuro project
+      | name               | description         | owner    |
+      | Sample Project     | Sample Description  | joaosilva |
+		And I am on article "Sample Project"
+		And I should be on /joaosilva/sample-project
+		When I follow "Delete"
+		And I confirm the "Are you sure that you want to remove the item "Sample Project"?" dialog
+		Then I go to /joaosilva/sample-project
+		And I should see "There is no such page: /joaosilva/sample-project"
+		
--
libgit2 0.21.2