diff --git a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb b/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
deleted file mode 100644
index 38748ff..0000000
--- a/plugins/mezuro/controllers/mezuro_plugin_myprofile_controller.rb
+++ /dev/null
@@ -1,127 +0,0 @@
-class MezuroPluginMyprofileController < ProfileController
-
-  append_view_path File.join(File.dirname(__FILE__) + '/../views')
-
-  rescue_from Exception do |exception|
-    message = URI.escape(CGI.escape(exception.message),'.')
-    redirect_to_error_page message
-  end
-
-  def error_page
-    @message = params[:message]
-  end
-
-  def choose_base_tool
-    @configuration_content = profile.articles.find(params[:id])
-    @base_tools = Kalibro::BaseTool.all_names
-  end
-
-  def choose_metric
-    @configuration_content = profile.articles.find(params[:id])
-    @base_tool = params[:base_tool]
-    base_tool = Kalibro::BaseTool.find_by_name(@base_tool)
-    @supported_metrics = base_tool.nil? ? [] : base_tool.supported_metrics 
-  end
-
-  def new_metric_configuration
-    @configuration_content = profile.articles.find(params[:id])
-    @metric = Kalibro::BaseTool.find_by_name(params[:base_tool]).metric params[:metric_name]
-  end
-
-  def new_compound_metric_configuration
-    @configuration_content = profile.articles.find(params[:id])
-    @metric_configurations = @configuration_content.metric_configurations
-    if configuration_content_has_errors?
-      redirect_to_error_page @configuration_content.errors[:base]
-    end
-  end
-
-  def edit_metric_configuration
-    @configuration_content = profile.articles.find(params[:id])
-    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
-    @metric = @metric_configuration.metric
-  end
-
-  def edit_compound_metric_configuration
-    @configuration_content = profile.articles.find(params[:id])
-    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
-    @metric_configurations = @configuration_content.metric_configurations
-    @metric = @metric_configuration.metric
-  end
-
-  def create_metric_configuration
-    id = params[:id]
-    metric_name = params[:metric_configuration][:metric][:name]
-    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
-    metric_configuration.save
-    if metric_configuration_has_errors? metric_configuration
-      redirect_to_error_page metric_configuration.errors[0].message
-    else
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
-    end
-  end
-
-  def create_compound_metric_configuration
-    id = params[:id]
-    metric_name = params[:metric_configuration][:metric][:name]
-    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
-    metric_configuration.save
-    if metric_configuration_has_errors? metric_configuration
-      redirect_to_error_page metric_configuration.errors[0].message
-    else
-      redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/edit_compound_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
-    end
-  end
-
-  def update_metric_configuration
-    @configuration_content = profile.articles.find(params[:id])
-    metric_name = params[:metric_configuration][:metric][:name]
-    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
-    metric_configuration.update_attributes params[:metric_configuration]
-    if metric_configuration_has_errors? metric_configuration
-      redirect_to_error_page metric_configuration.errors[0].message
-    else
-      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
-    end
-  end
-
-  def update_compound_metric_configuration
-    @configuration_content = profile.articles.find(params[:id])
-    metric_name = params[:metric_configuration][:metric][:name]
-    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
-    metric_configuration.update_attributes params[:metric_configuration]
-    if metric_configuration_has_errors? metric_configuration
-      redirect_to_error_page metric_configuration.errors[0].message
-    else
-      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
-    end
-  end
-
-  def remove_metric_configuration
-    configuration_content = profile.articles.find(params[:id])
-    metric_name = params[:metric_name]
-    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
-    metric_configuration.destroy
-    if metric_configuration_has_errors? metric_configuration
-      redirect_to_error_page metric_configuration.errors[0].message
-    else
-      redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
-    end
-  end
-
-  private
-
-  def redirect_to_error_page(message)
-    message = URI.escape(CGI.escape(message),'.')
-    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
-  end
-
-  def configuration_content_has_errors?
-    not @configuration_content.errors[:base].nil?
-  end
-
-  def metric_configuration_has_errors? metric_configuration
-    not metric_configuration.errors.empty?
-  end
-
-end
diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
new file mode 100644
index 0000000..cc55976
--- /dev/null
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_metric_configuration_controller.rb
@@ -0,0 +1,98 @@
+class MezuroPluginMetricConfigurationController < MezuroPluginMyprofileController
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+
+
+  def new_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric = Kalibro::BaseTool.find_by_name(params[:base_tool]).metric params[:metric_name]
+  end
+
+  def new_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configurations = @configuration_content.metric_configurations
+    if configuration_content_has_errors?
+      redirect_to_error_page @configuration_content.errors[:base]
+    end
+  end
+
+  def edit_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
+    @metric = @metric_configuration.metric
+  end
+
+  def edit_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    @metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, params[:metric_name])
+    @metric_configurations = @configuration_content.metric_configurations
+    @metric = @metric_configuration.metric
+  end
+
+  def create_metric_configuration
+    id = params[:id]
+    metric_name = params[:metric_configuration][:metric][:name]
+    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
+    metric_configuration.save
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "edit_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+    end
+  end
+
+  def create_compound_metric_configuration
+    id = params[:id]
+    metric_name = params[:metric_configuration][:metric][:name]
+    metric_configuration = Kalibro::MetricConfiguration.new(params[:metric_configuration])
+    metric_configuration.save
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "edit_compound_metric_configuration?id=#{id}&metric_name=#{metric_name.gsub(/\s/, '+')}"
+    end
+  end
+
+  def update_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_configuration][:metric][:name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
+    metric_configuration.update_attributes params[:metric_configuration]
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    end
+  end
+
+  def update_compound_metric_configuration
+    @configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_configuration][:metric][:name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(@configuration_content.name, metric_name)
+    metric_configuration.update_attributes params[:metric_configuration]
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{@configuration_content.slug}"
+    end
+  end
+
+  def remove_metric_configuration
+    configuration_content = profile.articles.find(params[:id])
+    metric_name = params[:metric_name]
+    metric_configuration = Kalibro::MetricConfiguration.find_by_configuration_name_and_metric_name(configuration_content.name, metric_name)
+    metric_configuration.destroy
+    if metric_configuration_has_errors? metric_configuration
+      redirect_to_error_page metric_configuration.errors[0].message
+    else
+      redirect_to "/#{profile.identifier}/#{configuration_content.slug}"
+    end
+  end
+  
+  private
+  
+  def configuration_content_has_errors?
+    not @configuration_content.errors[:base].nil?
+  end
+  
+end
diff --git a/plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb b/plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb
new file mode 100644
index 0000000..ba36ae9
--- /dev/null
+++ b/plugins/mezuro/controllers/myprofile/mezuro_plugin_myprofile_controller.rb
@@ -0,0 +1,37 @@
+class MezuroPluginMyprofileController < ProfileController #MyprofileController?
+
+  append_view_path File.join(File.dirname(__FILE__) + '/../../views')
+
+  rescue_from Exception do |exception|
+    message = URI.escape(CGI.escape(exception.message),'.')
+    redirect_to_error_page message
+  end
+
+  def error_page
+    @message = params[:message]
+  end
+
+  def choose_base_tool
+    @configuration_content = profile.articles.find(params[:id])
+    @base_tools = Kalibro::BaseTool.all_names
+  end
+
+  def choose_metric
+    @configuration_content = profile.articles.find(params[:id])
+    @base_tool = params[:base_tool]
+    base_tool = Kalibro::BaseTool.find_by_name(@base_tool)
+    @supported_metrics = base_tool.nil? ? [] : base_tool.supported_metrics 
+  end
+
+  protected
+
+  def redirect_to_error_page(message)
+    message = URI.escape(CGI.escape(message),'.')
+    redirect_to "/myprofile/#{profile.identifier}/plugin/mezuro/error_page?message=#{message}"
+  end
+
+  def metric_configuration_has_errors? metric_configuration
+    not metric_configuration.errors.empty?
+  end
+
+end
diff --git a/plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb b/plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
index e7023cf..357587e 100644
--- a/plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
+++ b/plugins/mezuro/test/functional/mezuro_plugin_myprofile_controller_test.rb
@@ -53,105 +53,6 @@ class MezuroPluginMyprofileControllerTest < ActionController::TestCase
     assert_response 200
   end
 
-  should 'test new metric configuration' do
-    Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool, {:base_tool_name => @base_tool.name}).returns({:base_tool => @base_tool_hash})
-    get :new_metric_configuration, :profile => @profile.identifier, :id => @content.id, :base_tool => @base_tool.name, :metric_name => @metric.name
-    assert_equal @content, assigns(:configuration_content)
-    assert_equal @metric.name, assigns(:metric).name
-    assert_response 200
-  end
-  
-  
-  should 'test new compound metric configuration' do
-    Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, {:configuration_name => @content.name}).returns({:configuration => @configuration_hash})
-    get :new_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id
-    assert_equal @content, assigns(:configuration_content)
-    assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
-    assert_response 200
-  end
 
-  should 'test edit metric configuration' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @metric_configuration.metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    get :edit_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
-    assert_equal @content, assigns(:configuration_content)
-    assert_equal @metric_configuration.code, assigns(:metric_configuration).code
-    assert_equal @metric_configuration.metric.name, assigns(:metric).name
-    assert_response 200
-  end
-  
-  should 'test edit compound metric configuration' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
-    Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, {:configuration_name => @content.name}).returns({:configuration => @configuration_hash})
-    get :edit_compound_metric_configuration,
-        :profile => @profile.identifier,
-        :id => @content.id,
-        :metric_name => @compound_metric_configuration.metric.name
-    assert_equal @content, assigns(:configuration_content)
-    assert_equal @compound_metric_configuration.code, assigns(:metric_configuration).code
-    assert_equal @compound_metric_configuration.metric.name, assigns(:metric).name
-    assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
-    assert_response 200
-  end
-  
-  should 'test create native metric configuration' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-        :metric_configuration => @metric_configuration.to_hash,
-        :configuration_name => @metric_configuration.configuration_name})
-    get :create_metric_configuration,
-        :profile => @profile.identifier,
-        :id => @content.id,
-        :metric_configuration => @native_hash
-    assert_response 302
-  end
-  
-  should 'test compound metric creation' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-      :metric_configuration => @compound_metric_configuration.to_hash,
-      :configuration_name => @compound_metric_configuration.configuration_name})
-    get :create_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id, 
-    :metric_configuration => @compound_hash
-    assert_response 302
-  end
-
-  should 'test update native metric configuration' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @metric_configuration.metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-        :metric_configuration => @metric_configuration.to_hash,
-        :configuration_name => @metric_configuration.configuration_name})
-    get :update_metric_configuration, :profile => @profile.identifier, :id => @content.id, 
-      :metric_configuration => @native_hash
-    assert_equal @content, assigns(:configuration_content)
-    assert_response 302
-  end
-
-  should 'test update compound metric configuration' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
-        :metric_configuration => @compound_metric_configuration.to_hash,
-        :configuration_name => @compound_metric_configuration.configuration_name})
-    get :update_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id, 
-    :metric_configuration => @compound_hash
-    assert_equal @content, assigns(:configuration_content)
-    assert_response 302
-  end
-
-  should 'test remove metric configuration' do
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
-      :configuration_name => @content.name,
-      :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
-    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :remove_metric_configuration, {
-        :metric_name => @metric.name,
-        :configuration_name => @metric_configuration.configuration_name})
-    get :remove_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
-    assert_response 302
-  end
 
 end
diff --git a/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
new file mode 100644
index 0000000..ea8b23e
--- /dev/null
+++ b/plugins/mezuro/test/functional/myprofile/mezuro_plugin_metric_configuration_controller_test.rb
@@ -0,0 +1,141 @@
+require 'test_helper'
+
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/base_tool_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/native_metric_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/metric_configuration_fixtures"
+require "#{RAILS_ROOT}/plugins/mezuro/test/fixtures/configuration_fixtures"
+
+class MezuroPluginMetricConfigurationControllerTest < ActionController::TestCase
+
+  def setup
+    @controller = MezuroPluginMetricConfigurationController.new
+    @request = ActionController::TestRequest.new
+    @response = ActionController::TestResponse.new
+    @profile = fast_create(Community)
+
+    @base_tool = BaseToolFixtures.base_tool
+    @base_tool_hash = BaseToolFixtures.base_tool_hash
+    @metric = NativeMetricFixtures.amloc
+    @metric_configuration = MetricConfigurationFixtures.amloc_metric_configuration
+    @metric_configuration_hash = MetricConfigurationFixtures.amloc_metric_configuration_hash
+    @compound_metric_configuration = MetricConfigurationFixtures.sc_metric_configuration
+    @compound_metric_configuration_hash = MetricConfigurationFixtures.sc_metric_configuration_hash
+    @configuration = ConfigurationFixtures.configuration
+    @configuration_hash = ConfigurationFixtures.configuration_hash
+
+    Kalibro::Configuration.expects(:all_names).returns([])
+    @content = MezuroPlugin::ConfigurationContent.new(:profile => @profile, :name => @configuration.name)
+    @content.expects(:send_kalibro_configuration_to_service).returns(nil)
+    @content.stubs(:solr_save)
+    @content.save
+
+    @native_hash = @metric_configuration.to_hash.merge({:configuration_name => @metric_configuration.configuration_name})
+    @native_hash.delete :attributes!    
+    @compound_hash = @compound_metric_configuration.to_hash.merge({:configuration_name => @compound_metric_configuration.configuration_name})
+    @compound_hash.delete :attributes!
+    
+  end
+  
+  should 'test new metric configuration' do
+    Kalibro::BaseTool.expects(:request).with("BaseTool", :get_base_tool, {:base_tool_name => @base_tool.name}).returns({:base_tool => @base_tool_hash})
+    get :new_metric_configuration, :profile => @profile.identifier, :id => @content.id, :base_tool => @base_tool.name, :metric_name => @metric.name
+    assert_equal @content, assigns(:configuration_content)
+    assert_equal @metric.name, assigns(:metric).name
+    assert_response 200
+  end
+  
+  
+  should 'test new compound metric configuration' do
+    Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, {
+      :configuration_name => @content.name}).returns({:configuration => @configuration_hash})
+    get :new_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id
+    assert_equal @content, assigns(:configuration_content)
+    assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
+    assert_response 200
+  end
+
+  should 'test edit metric configuration' do
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+      :configuration_name => @content.name,
+      :metric_name => @metric_configuration.metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+    get :edit_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
+    assert_equal @content, assigns(:configuration_content)
+    assert_equal @metric_configuration.code, assigns(:metric_configuration).code
+    assert_equal @metric_configuration.metric.name, assigns(:metric).name
+    assert_response 200
+  end
+  
+  should 'test edit compound metric configuration' do
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+      :configuration_name => @content.name,
+      :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
+    Kalibro::Configuration.expects(:request).with("Configuration", :get_configuration, {:configuration_name => @content.name}).returns({:configuration => @configuration_hash})
+    get :edit_compound_metric_configuration,
+        :profile => @profile.identifier,
+        :id => @content.id,
+        :metric_name => @compound_metric_configuration.metric.name
+    assert_equal @content, assigns(:configuration_content)
+    assert_equal @compound_metric_configuration.code, assigns(:metric_configuration).code
+    assert_equal @compound_metric_configuration.metric.name, assigns(:metric).name
+    assert_equal @configuration.metric_configuration[0].code, assigns(:metric_configurations)[0].code
+    assert_response 200
+  end
+  
+  should 'test create native metric configuration' do
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+        :metric_configuration => @metric_configuration.to_hash,
+        :configuration_name => @metric_configuration.configuration_name})
+    get :create_metric_configuration,
+        :profile => @profile.identifier,
+        :id => @content.id,
+        :metric_configuration => @native_hash
+    assert_response 302
+  end
+  
+  should 'test compound metric creation' do
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+      :metric_configuration => @compound_metric_configuration.to_hash,
+      :configuration_name => @compound_metric_configuration.configuration_name})
+    get :create_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id, 
+      :metric_configuration => @compound_hash
+    assert_response 302
+  end
+
+  should 'test update native metric configuration' do
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+      :configuration_name => @content.name,
+      :metric_name => @metric_configuration.metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+        :metric_configuration => @metric_configuration.to_hash,
+        :configuration_name => @metric_configuration.configuration_name})
+    get :update_metric_configuration, :profile => @profile.identifier, :id => @content.id, 
+      :metric_configuration => @native_hash
+    assert_equal @content, assigns(:configuration_content)
+    assert_response 302
+  end
+
+  should 'test update compound metric configuration' do
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+      :configuration_name => @content.name,
+      :metric_name => @compound_metric_configuration.metric.name}).returns({:metric_configuration => @compound_metric_configuration_hash})
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :save_metric_configuration, {
+        :metric_configuration => @compound_metric_configuration.to_hash,
+        :configuration_name => @compound_metric_configuration.configuration_name})
+    get :update_compound_metric_configuration, :profile => @profile.identifier, :id => @content.id, 
+    :metric_configuration => @compound_hash
+    assert_equal @content, assigns(:configuration_content)
+    assert_response 302
+  end
+
+  should 'test remove metric configuration' do
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :get_metric_configuration, {
+      :configuration_name => @content.name,
+      :metric_name => @metric.name}).returns({:metric_configuration => @metric_configuration_hash})
+    Kalibro::MetricConfiguration.expects(:request).with("MetricConfiguration", :remove_metric_configuration, {
+        :metric_name => @metric.name,
+        :configuration_name => @metric_configuration.configuration_name})
+    get :remove_metric_configuration, :profile => @profile.identifier, :id => @content.id, :metric_name => @metric.name
+    assert_response 302
+  end
+
+end
diff --git a/plugins/mezuro/views/content_viewer/show_configuration.rhtml b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
index 804aabe..e21edb1 100644
--- a/plugins/mezuro/views/content_viewer/show_configuration.rhtml
+++ b/plugins/mezuro/views/content_viewer/show_configuration.rhtml
@@ -40,18 +40,18 @@
             <%= metric_configuration.metric.origin %>
           </td>
           <td><%= metric_configuration.code %></td>
-          <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_metric_configuration", :params =>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_metric_configuration", :params =>
             {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
         <% else %>
           <td>
             Compound Metric
           </td>
           <td><%= metric_configuration.code %></td>
-          <td><%= link_to "Edit", :controller => "mezuro_plugin_myprofile", :action => "edit_compound_metric_configuration", :params =>
+          <td><%= link_to "Edit", :controller => "mezuro_plugin_metric_configuration", :action => "edit_compound_metric_configuration", :params =>
             {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
         <% end %>
         
-        <td><%= link_to "Remove", :controller => "mezuro_plugin_myprofile", :action => "remove_metric_configuration", :params =>
+        <td><%= link_to "Remove", :controller => "mezuro_plugin_metric_configuration", :action => "remove_metric_configuration", :params =>
           {:metric_name => metric_configuration.metric.name, :id => @configuration_content.id} %></td>
       </tr>
     <% end %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb
new file mode 100644
index 0000000..630b914
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/_metric_codes.html.erb
@@ -0,0 +1,12 @@
+<table>
+  <tr class="titles">
+      <td><h5>Metric Name</h5></td>
+      <td><h5>Metric Code</h5></td>
+  </tr>
+  <% metric_configurations.each do |metric_configuration| %>
+    <tr class="metric">
+      <td><%= metric_configuration.metric.name %></td>
+      <td><%= metric_configuration.code %></td>
+    </tr>
+  <% end %>
+</table>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb
new file mode 100644
index 0000000..dffd5dc
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_compound_metric_configuration.html.erb
@@ -0,0 +1,81 @@
+<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
+<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.min.js" type="text/javascript"></script>
+<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.js" type="text/javascript"></script>
+
+<h2><%= @configuration_content.name %> Configuration</h2>
+
+<% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
+  <%= hidden_field_tag :id, @configuration_content.id %>
+  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
+
+  <p>
+    <%= "Metric Name:" + @metric.name %>   
+  </p>  
+  <% f.fields_for :metric do |m| %>
+    <%= m.hidden_field :name, :value => @metric.name %>
+    <p>
+      <%= m.label :description, "Description:" %>
+      <%= m.text_field "description", :value => @metric.description %>
+    </p>
+    <p>
+      <%= m.label :scope, "Scope:" %>
+      <%= m.select :scope, [["Class", "CLASS"]], :selected => @metric.scope %>
+    </p>
+    <p>
+      <%= m.label :script, "Script:" %>
+      <%= m.text_area "script", :value => @metric.script %>
+    </p>
+  <% end %>
+  <p>
+    <%= f.label :code, "Code:" %>
+    <%= f.text_field "code" %>
+  </p>
+  <p>
+    <%= f.label :aggregation_form, "Aggregation Form:" %>
+    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
+    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
+  </p>
+  <p>
+    <%= f.label :weight, "Weight:" %>
+    <%= f.text_field :weight %>
+  </p>
+  <p>
+    <%= f.submit "Save" %>
+  </p>
+<% end %>
+
+
+<h5> Ranges </h5><br/>
+
+<table id="ranges">
+  <tr>
+    <td>
+      Label
+    </td>
+    <td>
+      Beginning
+    </td>
+    <td>
+      End
+    </td>
+    <td>
+      Grade
+    </td>
+    <td>
+      Color
+    </td>       
+  </tr>
+  <% if (@metric_configuration.ranges!=nil) 
+    @metric_configuration.ranges.each do |range| %>
+      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
+          :metric_name => @metric_configuration.metric.name} %>
+    <% end
+  end %>
+</table>
+
+<br/>
+<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
+<div id="range_form" style="display:none"></div>
+
+<br/>
+<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb
new file mode 100644
index 0000000..401ab1d
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/edit_metric_configuration.html.erb
@@ -0,0 +1,88 @@
+<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
+<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.min.js" type="text/javascript"></script>
+<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.js" type="text/javascript"></script>
+
+<h2><%= @configuration_content.name %> Configuration</h2>
+
+<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
+  <%= hidden_field_tag :id, @configuration_content.id %>
+  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
+  
+  <% f.fields_for :metric do |m| %>
+  
+    <% @metric.language.each do |language| %>
+      <%= m.hidden_field :language, :multiple => true, :value => language %>
+    <% end %>
+    
+    <%= m.hidden_field "scope", :value => @metric.scope %>
+    <p>
+      <%= m.label :origin, "Collector Name:" %>
+      <%= @metric.origin %>
+      <%= m.hidden_field "origin", :value => @metric.origin %>
+    </p>
+    <p>
+      <%= m.label :metric_name, "Metric Name:" %>
+      <%= @metric.name %>
+      <%= m.hidden_field "name", :value => @metric.name %>
+    </p>
+    <!--<p>-->    
+      <% m.label :description, "Description:" %>
+      <% @metric.description %>
+      <% m.hidden_field "description", :value => @metric.description %>
+    <!--</p>-->
+  <% end %>
+  <p>
+    <%= f.label :code, "Code:" %>
+    <%= @metric_configuration.code %>
+    <%= f.hidden_field "code", :value => @metric_configuration.code %>
+  </p>
+  <p>
+    <%= f.label :aggregation_form, "Aggregation Form:" %>
+    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
+    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
+  </p>
+  <p>
+    <%= f.label :weight, "Weight:" %>
+    <%= f.text_field "weight", :value => @metric_configuration.weight %>
+  </p>
+
+  <p>
+    <%= f.submit "Save" %>
+  </p>
+<% end %>
+
+
+<h5> Ranges </h5><br/>
+
+<table id="ranges">
+  <tr>
+    <td>
+      Label
+    </td>
+    <td>
+      Beginning
+    </td>
+    <td>
+      End
+    </td>
+    <td>
+      Grade
+    </td>
+    <td>
+      Color
+    </td>   
+    <td></td>    
+    <td></td>
+  </tr>
+  <% if (@metric_configuration.ranges!=nil) 
+    @metric_configuration.ranges.each do |range| %>
+      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
+          :metric_name => @metric.name} %>
+    <% end
+  end %>
+</table>
+
+<br/>
+<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
+<div id="range_form" style="display:none"></div>
+
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound_metric_configuration.html.erb
new file mode 100644
index 0000000..2746e13
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_compound_metric_configuration.html.erb
@@ -0,0 +1,44 @@
+<h2><%= @configuration_content.name %> Configuration</h2>
+
+<% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
+:controller => "mezuro_plugin_metric_configuration"}, :method => :get do |f| %>
+  <%= hidden_field_tag :id, @configuration_content.id %>
+  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
+
+  <% f.fields_for :metric do |m| %>
+    <p>
+      <%= m.label :name, "Name:" %>
+      <%= m.text_field "name" %>
+    </p>
+    <p>
+      <%= m.label :description, "Description:" %>
+      <%= m.text_field "description" %>
+    </p>
+    <p>
+      <%= m.label :scope, "Scope:" %>
+      <%= m.select :scope, [["Class", "CLASS"]] %>
+    </p>
+    <p>
+      <%= m.label :script, "Script:" %>
+      <%= m.text_area "script" %>
+    </p>
+  <% end %>
+  <p>
+    <%= f.label :code, "Code:" %>
+    <%= f.text_field "code" %>
+  </p>
+  <p>
+    <%= f.label :aggregation_form, "Aggregation Form:" %>
+    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
+    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
+  </p>
+  <p>
+    <%= f.label :weight, "Weight:" %>
+    <%= f.text_field :weight %>
+  </p>
+  <p>
+    <%= f.submit "Add" %>
+  </p>
+<% end %>
+
+<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %>
diff --git a/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_metric_configuration.html.erb
new file mode 100644
index 0000000..d028bb9
--- /dev/null
+++ b/plugins/mezuro/views/mezuro_plugin_metric_configuration/new_metric_configuration.html.erb
@@ -0,0 +1,51 @@
+<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
+
+<h2><%= @configuration_content.name %> Configuration</h2>
+
+<% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_metric_configuration"},  :method => :get do |f| %>
+  <%= hidden_field_tag :id, @configuration_content.id %>
+  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
+  
+  <% f.fields_for :metric do |m| %>
+  
+    <% @metric.language.each do |language| %>
+      <%= m.hidden_field :language, :multiple => true, :value => language %>
+    <% end %>
+    
+    <%= m.hidden_field "scope", :value => @metric.scope %>
+    <p>
+      <%= m.label :origin, "Collector Name:" %>
+      <%= @metric.origin %>
+      <%= m.hidden_field "origin", :value => @metric.origin %>
+    </p>
+    <p>
+      <%= m.label :name, "Metric Name:" %>
+      <%= @metric.name %>
+      <%= m.hidden_field "name", :value => @metric.name %>
+    </p>
+    <!--<p>-->
+      <% m.label :description, "Description:" %>
+      <% @metric.description %>
+      <% m.hidden_field "description", :value => @metric.description %>
+    <!--</p>-->
+  <% end %>
+  <p>
+    <%= f.label :code, "Code:" %>
+    <%= f.text_field :code %>
+  </p>
+  <p>
+    <%= f.label :aggregation_form, "Aggregation Form:" %>
+    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
+    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
+  </p>
+  <p>
+    <%= f.label :weight, "Weight:" %>
+    <%= f.text_field :weight %>
+  </p>
+
+  <p>
+    <%= f.submit "Add" %>
+  </p>
+
+<% end %>
+
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb
deleted file mode 100644
index 630b914..0000000
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/_metric_codes.html.erb
+++ /dev/null
@@ -1,12 +0,0 @@
-<table>
-  <tr class="titles">
-      <td><h5>Metric Name</h5></td>
-      <td><h5>Metric Code</h5></td>
-  </tr>
-  <% metric_configurations.each do |metric_configuration| %>
-    <tr class="metric">
-      <td><%= metric_configuration.metric.name %></td>
-      <td><%= metric_configuration.code %></td>
-    </tr>
-  <% end %>
-</table>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
deleted file mode 100644
index a123385..0000000
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_compound_metric_configuration.html.erb
+++ /dev/null
@@ -1,81 +0,0 @@
-<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
-<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.min.js" type="text/javascript"></script>
-<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.js" type="text/javascript"></script>
-
-<h2><%= @configuration_content.name %> Configuration</h2>
-
-<% form_for :metric_configuration, :url => {:action =>"update_compound_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
-
-  <p>
-    <%= "Metric Name:" + @metric.name %>   
-  </p>  
-  <% f.fields_for :metric do |m| %>
-    <%= m.hidden_field :name, :value => @metric.name %>
-    <p>
-      <%= m.label :description, "Description:" %>
-      <%= m.text_field "description", :value => @metric.description %>
-    </p>
-    <p>
-      <%= m.label :scope, "Scope:" %>
-      <%= m.select :scope, [["Class", "CLASS"]], :selected => @metric.scope %>
-    </p>
-    <p>
-      <%= m.label :script, "Script:" %>
-      <%= m.text_area "script", :value => @metric.script %>
-    </p>
-  <% end %>
-  <p>
-    <%= f.label :code, "Code:" %>
-    <%= f.text_field "code" %>
-  </p>
-  <p>
-    <%= f.label :aggregation_form, "Aggregation Form:" %>
-    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
-    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
-  </p>
-  <p>
-    <%= f.label :weight, "Weight:" %>
-    <%= f.text_field :weight %>
-  </p>
-  <p>
-    <%= f.submit "Save" %>
-  </p>
-<% end %>
-
-
-<h5> Ranges </h5><br/>
-
-<table id="ranges">
-  <tr>
-    <td>
-      Label
-    </td>
-    <td>
-      Beginning
-    </td>
-    <td>
-      End
-    </td>
-    <td>
-      Grade
-    </td>
-    <td>
-      Color
-    </td>       
-  </tr>
-  <% if (@metric_configuration.ranges!=nil) 
-    @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
-          :metric_name => @metric_configuration.metric.name} %>
-    <% end
-  end %>
-</table>
-
-<br/>
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
-<div id="range_form" style="display:none"></div>
-
-<br/>
-<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
deleted file mode 100644
index 75dd0df..0000000
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/edit_metric_configuration.html.erb
+++ /dev/null
@@ -1,88 +0,0 @@
-<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
-<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.min.js" type="text/javascript"></script>
-<script src="/plugins/mezuro/javascripts/colorPicker/jquery.colorPicker.js" type="text/javascript"></script>
-
-<h2><%= @configuration_content.name %> Configuration</h2>
-
-<% form_for :metric_configuration, :url => {:action =>"update_metric_configuration", :controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
-  
-  <% f.fields_for :metric do |m| %>
-  
-    <% @metric.language.each do |language| %>
-      <%= m.hidden_field :language, :multiple => true, :value => language %>
-    <% end %>
-    
-    <%= m.hidden_field "scope", :value => @metric.scope %>
-    <p>
-      <%= m.label :origin, "Collector Name:" %>
-      <%= @metric.origin %>
-      <%= m.hidden_field "origin", :value => @metric.origin %>
-    </p>
-    <p>
-      <%= m.label :metric_name, "Metric Name:" %>
-      <%= @metric.name %>
-      <%= m.hidden_field "name", :value => @metric.name %>
-    </p>
-    <!--<p>-->    
-      <% m.label :description, "Description:" %>
-      <% @metric.description %>
-      <% m.hidden_field "description", :value => @metric.description %>
-    <!--</p>-->
-  <% end %>
-  <p>
-    <%= f.label :code, "Code:" %>
-    <%= @metric_configuration.code %>
-    <%= f.hidden_field "code", :value => @metric_configuration.code %>
-  </p>
-  <p>
-    <%= f.label :aggregation_form, "Aggregation Form:" %>
-    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
-    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
-  </p>
-  <p>
-    <%= f.label :weight, "Weight:" %>
-    <%= f.text_field "weight", :value => @metric_configuration.weight %>
-  </p>
-
-  <p>
-    <%= f.submit "Save" %>
-  </p>
-<% end %>
-
-
-<h5> Ranges </h5><br/>
-
-<table id="ranges">
-  <tr>
-    <td>
-      Label
-    </td>
-    <td>
-      Beginning
-    </td>
-    <td>
-      End
-    </td>
-    <td>
-      Grade
-    </td>
-    <td>
-      Color
-    </td>   
-    <td></td>    
-    <td></td>
-  </tr>
-  <% if (@metric_configuration.ranges!=nil) 
-    @metric_configuration.ranges.each do |range| %>
-      <%= render :partial => "range", :locals => {:range => range, :id => @configuration_content.id, 
-          :metric_name => @metric.name} %>
-    <% end
-  end %>
-</table>
-
-<br/>
-<%= link_to_remote "New Range", :url => {:action =>"new_range", :controller => "mezuro_plugin_range", :id => @configuration_content.id, :metric_name => @metric.name} %>
-<div id="range_form" style="display:none"></div>
-
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
deleted file mode 100644
index 754cb4f..0000000
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_compound_metric_configuration.html.erb
+++ /dev/null
@@ -1,44 +0,0 @@
-<h2><%= @configuration_content.name %> Configuration</h2>
-
-<% form_for :metric_configuration, :url => {:action =>"create_compound_metric_configuration", 
-:controller => "mezuro_plugin_myprofile"}, :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
-
-  <% f.fields_for :metric do |m| %>
-    <p>
-      <%= m.label :name, "Name:" %>
-      <%= m.text_field "name" %>
-    </p>
-    <p>
-      <%= m.label :description, "Description:" %>
-      <%= m.text_field "description" %>
-    </p>
-    <p>
-      <%= m.label :scope, "Scope:" %>
-      <%= m.select :scope, [["Class", "CLASS"]] %>
-    </p>
-    <p>
-      <%= m.label :script, "Script:" %>
-      <%= m.text_area "script" %>
-    </p>
-  <% end %>
-  <p>
-    <%= f.label :code, "Code:" %>
-    <%= f.text_field "code" %>
-  </p>
-  <p>
-    <%= f.label :aggregation_form, "Aggregation Form:" %>
-    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
-    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
-  </p>
-  <p>
-    <%= f.label :weight, "Weight:" %>
-    <%= f.text_field :weight %>
-  </p>
-  <p>
-    <%= f.submit "Add" %>
-  </p>
-<% end %>
-
-<%= render :partial => "metric_codes", :locals => {:metric_configurations => @metric_configurations} %>
diff --git a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb b/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
deleted file mode 100644
index 818a2d8..0000000
--- a/plugins/mezuro/views/mezuro_plugin_myprofile/new_metric_configuration.html.erb
+++ /dev/null
@@ -1,51 +0,0 @@
-<script src="/plugins/mezuro/javascripts/validations.js" type="text/javascript"></script>
-
-<h2><%= @configuration_content.name %> Configuration</h2>
-
-<% form_for :metric_configuration, :url => {:action =>"create_metric_configuration", :controller => "mezuro_plugin_myprofile"},  :method => :get do |f| %>
-  <%= hidden_field_tag :id, @configuration_content.id %>
-  <%= f.hidden_field :configuration_name, :value => @configuration_content.name %>
-  
-  <% f.fields_for :metric do |m| %>
-  
-    <% @metric.language.each do |language| %>
-      <%= m.hidden_field :language, :multiple => true, :value => language %>
-    <% end %>
-    
-    <%= m.hidden_field "scope", :value => @metric.scope %>
-    <p>
-      <%= m.label :origin, "Collector Name:" %>
-      <%= @metric.origin %>
-      <%= m.hidden_field "origin", :value => @metric.origin %>
-    </p>
-    <p>
-      <%= m.label :name, "Metric Name:" %>
-      <%= @metric.name %>
-      <%= m.hidden_field "name", :value => @metric.name %>
-    </p>
-    <!--<p>-->
-      <% m.label :description, "Description:" %>
-      <% @metric.description %>
-      <% m.hidden_field "description", :value => @metric.description %>
-    <!--</p>-->
-  <% end %>
-  <p>
-    <%= f.label :code, "Code:" %>
-    <%= f.text_field :code %>
-  </p>
-  <p>
-    <%= f.label :aggregation_form, "Aggregation Form:" %>
-    <%= f.select :aggregation_form, [["Average","AVERAGE"], ["Median", "MEDIAN"], ["Maximum", "MAXIMUM"], ["Minimum", "MINIMUM"], 
-    ["Count", "COUNT"], ["Standard Deviation", "STANDARD_DEVIATION"]] %>
-  </p>
-  <p>
-    <%= f.label :weight, "Weight:" %>
-    <%= f.text_field :weight %>
-  </p>
-
-  <p>
-    <%= f.submit "Add" %>
-  </p>
-
-<% end %>
-
--
libgit2 0.21.2