diff --git a/Gemfile b/Gemfile
index 492f07a..e93915c 100644
--- a/Gemfile
+++ b/Gemfile
@@ -31,7 +31,6 @@ gem 'jbuilder', '~> 2.2.2'
 gem 'devise', '~> 3.4.0'
 
 # Kalibro integration
-gem 'kalibro_gatekeeper_client', '~> 1.0.0'
 gem 'kalibro_client', git: 'https://github.com/mezuro/kalibro_client'
 
 # PostgreSQL integration
diff --git a/Gemfile.lock b/Gemfile.lock
index 4646394..ffcb956 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -131,10 +131,6 @@ GEM
     factory_girl_rails (4.5.0)
       factory_girl (~> 4.5.0)
       railties (>= 3.0.0)
-    faraday (0.9.0)
-      multipart-post (>= 1.2, < 3)
-    faraday_middleware (0.9.1)
-      faraday (>= 0.7.4, < 0.10)
     gherkin (2.12.2)
       multi_json (~> 1.3)
     google-analytics-rails (0.0.6)
@@ -146,13 +142,10 @@ GEM
     jquery-rails (3.1.2)
       railties (>= 3.0, < 5.0)
       thor (>= 0.14, < 2.0)
-    jquery-ui-rails (5.0.2)
+    jquery-ui-rails (5.0.3)
       railties (>= 3.2.16)
     json (1.8.1)
-    kalibro_gatekeeper_client (1.0.0)
-      activesupport (>= 2.2.1)
-      faraday_middleware (~> 0.9.0)
-    konacha (3.3.0)
+    konacha (3.2.5)
       actionpack (>= 3.1, < 5)
       capybara
       colorize
@@ -169,12 +162,11 @@ GEM
       metaclass (~> 0.0.1)
     multi_json (1.10.1)
     multi_test (0.1.1)
-    multipart-post (2.0.0)
     net-scp (1.2.1)
       net-ssh (>= 2.6.5)
     net-ssh (2.9.1)
     netrc (0.8.0)
-    nokogiri (1.6.4.1)
+    nokogiri (1.6.5)
       mini_portile (~> 0.6.0)
     orm_adapter (0.5.0)
     pg (0.17.1)
@@ -203,8 +195,8 @@ GEM
       activesupport (= 4.1.6)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
-    rake (10.4.2)
-    rdoc (4.2.0)
+    rake (10.4.0)
+    rdoc (4.1.2)
       json (~> 1.4)
     ref (1.0.5)
     responders (1.1.2)
@@ -229,10 +221,10 @@ GEM
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
     sass (3.2.19)
-    sass-rails (4.0.4)
+    sass-rails (4.0.5)
       railties (>= 4.0.0, < 5.0)
       sass (~> 3.2.2)
-      sprockets (~> 2.8, < 2.12)
+      sprockets (~> 2.8, < 3.0)
       sprockets-rails (~> 2.0)
     sdoc (0.4.1)
       json (~> 1.7, >= 1.7.7)
@@ -244,8 +236,8 @@ GEM
       multi_json (~> 1.0)
       simplecov-html (~> 0.8.0)
     simplecov-html (0.8.0)
-    spring (1.1.3)
-    sprockets (2.11.3)
+    spring (1.2.0)
+    sprockets (2.12.3)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
@@ -306,8 +298,7 @@ DEPENDENCIES
   jquery-rails
   jquery-ui-rails (~> 5.0.0)
   kalibro_client!
-  kalibro_gatekeeper_client (~> 1.0.0)
-  konacha (~> 3.3.0)
+  konacha (~> 3.2.0)
   mocha
   pg (~> 0.17.0)
   poltergeist (~> 1.5.0)
diff --git a/spec/factories/metric_collectors.rb b/spec/factories/metric_collectors.rb
index c6f0b49..7a5644c 100644
--- a/spec/factories/metric_collectors.rb
+++ b/spec/factories/metric_collectors.rb
@@ -1,5 +1,5 @@
 FactoryGirl.define do
-  factory :metric_collector, class: KalibroGatekeeperClient::Entities::MetricCollector do
+  factory :metric_collector, class: MetricCollector do
     name 'Analizo'
     supported_metrics { { "total_abstract_classes" => FactoryGirl.build(:metric).to_hash, "loc" => FactoryGirl.build(:loc).to_hash } }
   end
diff --git a/spec/factories/metric_configurations.rb b/spec/factories/metric_configurations.rb
index 972bb6e..3696e1b 100644
--- a/spec/factories/metric_configurations.rb
+++ b/spec/factories/metric_configurations.rb
@@ -13,10 +13,10 @@ FactoryGirl.define do
   factory :compound_metric_configuration, class: MetricConfiguration do
     id 1
     code 'compound'
-    metric {FactoryGirl.build(:compound_metric, {script: 'native*2;'})}
+    metric {FactoryGirl.build(:compound_metric, script: 'native*2;')}
     weight 1
     aggregation_form "AVERAGE"
     reading_group_id 1
     configuration_id 1
   end
-end
\ No newline at end of file
+end
diff --git a/spec/factories/metric_configurations_snapshot.rb b/spec/factories/metric_configurations_snapshot.rb
index 8636006..e09dfa1 100644
--- a/spec/factories/metric_configurations_snapshot.rb
+++ b/spec/factories/metric_configurations_snapshot.rb
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 FactoryGirl.define do
-  factory :metric_configuration_snapshot, class: KalibroGatekeeperClient::Entities::MetricConfigurationSnapshot do
+  factory :metric_configuration_snapshot, class: KalibroClient::Configurations::MetricSnapshot do
 		code "code"
 		weight "1.0"
 		aggregation_form 'AVERAGE'
@@ -23,4 +23,4 @@ FactoryGirl.define do
 		metric_collector_name "Analizo"
 		range {FactoryGirl.build(:range_snapshot)}
   end
-end
\ No newline at end of file
+end
diff --git a/spec/factories/metric_results.rb b/spec/factories/metric_results.rb
index c58098d..8e81ac0 100644
--- a/spec/factories/metric_results.rb
+++ b/spec/factories/metric_results.rb
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 FactoryGirl.define do
-  factory :metric_result, class: KalibroGatekeeperClient::Entities::MetricResult do
+  factory :metric_result, class: KalibroClient::Processor::MetricResult do
     id  "42"
     self.configuration { FactoryGirl.build(:metric_configuration_snapshot) }
     value "10.0"
diff --git a/spec/factories/metrics.rb b/spec/factories/metrics.rb
index f0ff685..7efbb40 100644
--- a/spec/factories/metrics.rb
+++ b/spec/factories/metrics.rb
@@ -1,25 +1,25 @@
 FactoryGirl.define do
-  factory :metric, class: KalibroGatekeeperClient::Entities::Metric do
+  factory :metric, class: KalibroClient::Processor::Metric do
     name "Total Abstract Classes"
     code "total_abstract_classes"
     compound false
     scope "SOFTWARE"
     description nil
-    script ""
-    language ["C", "CPP", "JAVA"]
+
+    initialize_with { new(compound, name, code, scope) }
   end
 
-  factory :loc, class: KalibroGatekeeperClient::Entities::Metric do
+  factory :loc, class: KalibroClient::Processor::Metric do
     name "Lines of Code"
     code "loc"
     compound false
     scope "CLASS"
     description nil
-    script ""
-    language ["C", "CPP", "JAVA"]
+
+    initialize_with { new(compound, name, code, scope) }
   end
 
-  factory :compound_metric, class: KalibroGatekeeperClient::Entities::Metric do
+  factory :compound_metric, class: KalibroClient::Processor::Metric do
     name "Compound"
     code "compound"
     compound true
@@ -27,5 +27,7 @@ FactoryGirl.define do
     description nil
     script ""
     language ["C", "CPP", "JAVA"]
+
+    initialize_with { new(compound, name, code, scope) }
   end
-end
\ No newline at end of file
+end
diff --git a/spec/factories/modules.rb b/spec/factories/modules.rb
index e06c5d0..9f563c1 100644
--- a/spec/factories/modules.rb
+++ b/spec/factories/modules.rb
@@ -1,6 +1,6 @@
 FactoryGirl.define do
-  factory :module, class: KalibroGatekeeperClient::Entities::Module do
+  factory :module, class: KalibroClient::Processor::KalibroModule do
     name 'Qt-Calculator'
     granularity 'APPLICATION'
   end
-end
\ No newline at end of file
+end
diff --git a/spec/factories/process_times.rb b/spec/factories/process_times.rb
index aa07b97..23bcbe4 100644
--- a/spec/factories/process_times.rb
+++ b/spec/factories/process_times.rb
@@ -1,11 +1,11 @@
 FactoryGirl.define do
-  factory :process_time, class: KalibroGatekeeperClient::Entities::ProcessTime do
+  factory :process_time, class: KalibroClient::Processor::ProcessTime do
     state "Ready"
     time  "3600"
   end
 
-  factory :analyzing_process_time, class: KalibroGatekeeperClient::Entities::ProcessTime do
+  factory :analyzing_process_time, class: KalibroClient::Processor::ProcessTime do
     state "Analyzing"
     time  "12345"
   end
-end
\ No newline at end of file
+end
diff --git a/spec/factories/ranges_snapshot.rb b/spec/factories/ranges_snapshot.rb
index 9e739af..eed70ce 100644
--- a/spec/factories/ranges_snapshot.rb
+++ b/spec/factories/ranges_snapshot.rb
@@ -15,7 +15,7 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 FactoryGirl.define do
-  factory :range_snapshot, class: KalibroGatekeeperClient::Entities::RangeSnapshot do
+  factory :range_snapshot, class: KalibroClient::Configurations::KalibroRange do
     beginning 1.1
   	self.end 5.1
   	label "Snapshot"
@@ -23,4 +23,4 @@ FactoryGirl.define do
   	color "FF2284"
   	comments "Comment"
   end
-end
\ No newline at end of file
+end
--
libgit2 0.21.2