diff --git a/Gemfile.lock b/Gemfile.lock
index 970c5af..1b271ed 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -55,7 +55,7 @@ GEM
       rack (~> 2.2)
       rack-protection (= 2.2.0)
       tilt (~> 2.0)
-    sqlite3 (1.3.12)
+    sqlite3 (1.4.2)
     thread_safe (0.3.5)
     tilt (2.0.10)
     timecop (0.8.1)
diff --git a/bin/console b/bin/console
deleted file mode 100755
index db0b023..0000000
--- a/bin/console
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-require "bundler/setup"
-require "crono"
-
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
-
-require "irb"
-IRB.start
diff --git a/exe/crono b/bin/crono
similarity index 100%
rename from exe/crono
rename to bin/crono
diff --git a/bin/setup b/bin/setup
deleted file mode 100644
index b65ed50..0000000
--- a/bin/setup
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-set -euo pipefail
-IFS=$'\n\t'
-
-bundle install
-
-# Do any other automated setup that you need to do here
diff --git a/crono.gemspec b/crono.gemspec
index 4e153f5..1c04fd8 100644
--- a/crono.gemspec
+++ b/crono.gemspec
@@ -1,34 +1,33 @@
-# coding: utf-8
-lib = File.expand_path('../lib', __FILE__)
-$LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
+# -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
 require 'crono/version'
 
-Gem::Specification.new do |spec|
-  spec.name          = 'crono'
-  spec.version       = Crono::VERSION
-  spec.authors       = ['Dzmitry Plashchynski']
-  spec.email         = ['plashchynski@gmail.com']
+Gem::Specification.new do |s|
+  s.name          = 'crono'
+  s.version       = Crono::VERSION
+  s.authors       = ['Dzmitry Plashchynski']
+  s.email         = ['plashchynski@gmail.com']
 
-  spec.summary       = 'Job scheduler for Rails'
-  spec.description   = 'A time-based background job scheduler daemon (just like Cron) for Rails'
-  spec.homepage      = 'https://github.com/plashchynski/crono'
-  spec.license       = 'Apache-2.0'
+  s.summary       = 'Job scheduler for Rails'
+  s.description   = 'A time-based background job scheduler daemon (just like Cron) for Rails'
+  s.homepage      = 'https://github.com/plashchynski/crono'
+  s.license       = 'Apache-2.0'
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
-  spec.bindir        = 'exe' # http://bundler.io/blog/2015/03/20/moving-bins-to-exe.html
-  spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
-  spec.require_paths = ['lib']
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- spec/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
 
-  spec.add_runtime_dependency 'activesupport', '>= 4.0'
-  spec.add_runtime_dependency 'activerecord', '>= 4.0'
-  spec.add_development_dependency 'rake', '>= 10.0'
-  spec.add_development_dependency 'bundler', '>= 1.0.0'
-  spec.add_development_dependency 'rspec', '>= 3.0'
-  spec.add_development_dependency 'timecop', '>= 0.7'
-  spec.add_development_dependency 'sqlite3'
-  spec.add_development_dependency 'byebug'
-  spec.add_development_dependency 'sinatra'
-  spec.add_development_dependency 'haml'
-  spec.add_development_dependency 'rack-test'
-  spec.add_development_dependency 'daemons'
+  s.add_runtime_dependency 'activesupport', '>= 4.0'
+  s.add_runtime_dependency 'activerecord', '>= 4.0'
+  s.add_development_dependency 'rake', '>= 10.0'
+  s.add_development_dependency 'bundler', '>= 1.0.0'
+  s.add_development_dependency 'rspec', '>= 3.0'
+  s.add_development_dependency 'timecop', '>= 0.7'
+  s.add_development_dependency 'sqlite3'
+  s.add_development_dependency 'byebug'
+  s.add_development_dependency 'sinatra'
+  s.add_development_dependency 'haml'
+  s.add_development_dependency 'rack-test'
+  s.add_development_dependency 'daemons'
 end