diff --git a/.rubocop.yml b/.rubocop.yml
index 762eebb..cae0a80 100644
--- a/.rubocop.yml
+++ b/.rubocop.yml
@@ -6,3 +6,10 @@ Style/StringLiterals:
 
 Style/StringLiteralsInInterpolation:
   EnforcedStyle: double_quotes
+
+Style/Documentation:
+  Enabled: false
+
+Naming/FileName:
+  Exclude:
+    - 'lib/electionbuddy-ruby.rb'
\ No newline at end of file
diff --git a/electionbuddy-ruby.gemspec b/electionbuddy-ruby.gemspec
index b99d9be..4f10287 100644
--- a/electionbuddy-ruby.gemspec
+++ b/electionbuddy-ruby.gemspec
@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "lib/electionbuddy/ruby/version"
+require_relative "lib/election_buddy/version"
 
 Gem::Specification.new do |spec|
   spec.name = "electionbuddy-ruby"
-  spec.version = Electionbuddy::Ruby::VERSION
+  spec.version = ElectionBuddy::VERSION
   spec.authors = ["Alberto Rocha", "Henrique Lavezzo"]
   spec.email = ["developers@electionbuddy.com"]
 
diff --git a/lib/election_buddy.rb b/lib/election_buddy.rb
new file mode 100644
index 0000000..0326784
--- /dev/null
+++ b/lib/election_buddy.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module ElectionBuddy
+  require "election_buddy/version"
+end
diff --git a/lib/election_buddy/version.rb b/lib/election_buddy/version.rb
new file mode 100644
index 0000000..4d608b2
--- /dev/null
+++ b/lib/election_buddy/version.rb
@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module ElectionBuddy
+  VERSION = "0.1.0"
+end
diff --git a/lib/electionbuddy-ruby.rb b/lib/electionbuddy-ruby.rb
new file mode 100644
index 0000000..3cf57ca
--- /dev/null
+++ b/lib/electionbuddy-ruby.rb
@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+require "election_buddy"
diff --git a/lib/electionbuddy/ruby.rb b/lib/electionbuddy/ruby.rb
deleted file mode 100644
index 6af0736..0000000
--- a/lib/electionbuddy/ruby.rb
+++ /dev/null
@@ -1,10 +0,0 @@
-# frozen_string_literal: true
-
-require_relative "ruby/version"
-
-module Electionbuddy
-  module Ruby
-    class Error < StandardError; end
-    # Your code goes here...
-  end
-end
diff --git a/lib/electionbuddy/ruby/version.rb b/lib/electionbuddy/ruby/version.rb
deleted file mode 100644
index 329d67e..0000000
--- a/lib/electionbuddy/ruby/version.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-# frozen_string_literal: true
-
-module Electionbuddy
-  module Ruby
-    VERSION = "0.1.0"
-  end
-end
diff --git a/test/election_buddy/version_test.rb b/test/election_buddy/version_test.rb
new file mode 100644
index 0000000..834110b
--- /dev/null
+++ b/test/election_buddy/version_test.rb
@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require "test_helper"
+
+module ElectionBuddy
+  class VersionTest < Minitest::Test
+    def test_that_it_has_a_version_number
+      refute_nil ::ElectionBuddy::VERSION
+    end
+  end
+end
diff --git a/test/electionbuddy/test_ruby.rb b/test/electionbuddy/test_ruby.rb
deleted file mode 100644
index db2c1cf..0000000
--- a/test/electionbuddy/test_ruby.rb
+++ /dev/null
@@ -1,13 +0,0 @@
-# frozen_string_literal: true
-
-require "test_helper"
-
-class Electionbuddy::TestRuby < Minitest::Test
-  def test_that_it_has_a_version_number
-    refute_nil ::Electionbuddy::Ruby::VERSION
-  end
-
-  def test_it_does_something_useful
-    assert false
-  end
-end
diff --git a/test/test_helper.rb b/test/test_helper.rb
index 5ef8eb7..6142ce4 100644
--- a/test/test_helper.rb
+++ b/test/test_helper.rb
@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
-require "electionbuddy/ruby"
+require "election_buddy"
 
 require "minitest/autorun"