diff --git a/Gemfile b/Gemfile
index 2aa2239..aa67b33 100644
--- a/Gemfile
+++ b/Gemfile
@@ -4,9 +4,9 @@ group :assets do
   gem 'therubyracer'
 end
 
-gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-1-stable'
-
-gem 'spree_related_products', github: 'spree/spree_related_products', branch: '2-1-stable'
+gem 'spree', github: 'spree/spree', branch: '2-2-stable'
+gem 'spree_auth_devise', github: 'spree/spree_auth_devise', branch: '2-2-stable'
+gem 'spree_related_products', github: 'spree/spree_related_products', branch: '2-2-stable'
 gem 'spree_static_content', github: 'spree/spree_static_content', branch: 'master'
 
 gemspec
diff --git a/app/assets/javascripts/admin/spree_admin_bar.js b/app/assets/javascripts/admin/spree_admin_bar.js
deleted file mode 100644
index b181e56..0000000
--- a/app/assets/javascripts/admin/spree_admin_bar.js
+++ /dev/null
@@ -1 +0,0 @@
-//= require admin/spree_backend
diff --git a/app/assets/javascripts/spree/backend/spree_admin_bar.js b/app/assets/javascripts/spree/backend/spree_admin_bar.js
new file mode 100644
index 0000000..e69de29
diff --git a/app/assets/javascripts/spree/frontend/spree_admin_bar.js b/app/assets/javascripts/spree/frontend/spree_admin_bar.js
new file mode 100644
index 0000000..e69de29
diff --git a/app/assets/javascripts/store/spree_admin_bar.js b/app/assets/javascripts/store/spree_admin_bar.js
deleted file mode 100644
index d10fba7..0000000
--- a/app/assets/javascripts/store/spree_admin_bar.js
+++ /dev/null
@@ -1 +0,0 @@
-//= require store/spree_frontend
diff --git a/app/assets/stylesheets/admin/spree_admin_bar.css b/app/assets/stylesheets/admin/spree_admin_bar.css
deleted file mode 100644
index 5dc6dc9..0000000
--- a/app/assets/stylesheets/admin/spree_admin_bar.css
+++ /dev/null
@@ -1,3 +0,0 @@
-/*
- *= require admin/spree_backend
-*/
\ No newline at end of file
diff --git a/app/assets/stylesheets/spree/backend/spree_admin_bar.css b/app/assets/stylesheets/spree/backend/spree_admin_bar.css
new file mode 100644
index 0000000..e69de29
diff --git a/app/assets/stylesheets/store/spree_admin_bar.css.scss b/app/assets/stylesheets/spree/frontend/spree_admin_bar.css.scss
similarity index 90%
rename from app/assets/stylesheets/store/spree_admin_bar.css.scss
rename to app/assets/stylesheets/spree/frontend/spree_admin_bar.css.scss
index 53833f1..2e80fe1 100644
--- a/app/assets/stylesheets/store/spree_admin_bar.css.scss
+++ b/app/assets/stylesheets/spree/frontend/spree_admin_bar.css.scss
@@ -1,7 +1,3 @@
-/*
- *= require store/spree_frontend
-*/
-
 #admin_bar {
   font-size: 13px;
   font-family: verdana, sans-serif;
diff --git a/lib/generators/spree_admin_bar/install/install_generator.rb b/lib/generators/spree_admin_bar/install/install_generator.rb
index 164adde..314b5d4 100644
--- a/lib/generators/spree_admin_bar/install/install_generator.rb
+++ b/lib/generators/spree_admin_bar/install/install_generator.rb
@@ -5,13 +5,13 @@ class InstallGenerator < Rails::Generators::Base
       class_option :auto_run_migrations, :type => :boolean, :default => false
 
       def add_javascripts
-        append_file 'app/assets/javascripts/store/all.js', "//= require store/spree_admin_bar\n"
-        append_file 'app/assets/javascripts/admin/all.js', "//= require admin/spree_admin_bar\n"
+        append_file 'vendor/assets/javascripts/spree/frontend/all.js', "//= require spree/frontend/spree_admin_bar\n"
+        append_file 'vendor/assets/javascripts/spree/backend/all.js', "//= require spree/backend/spree_admin_bar\n"
       end
 
       def add_stylesheets
-        inject_into_file 'app/assets/stylesheets/store/all.css', " *= require store/spree_admin_bar\n", :before => /\*\//, :verbose => true
-        inject_into_file 'app/assets/stylesheets/admin/all.css', " *= require admin/spree_admin_bar\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/frontend/all.css', " *= require spree/frontend/spree_admin_bar\n", :before => /\*\//, :verbose => true
+        inject_into_file 'vendor/assets/stylesheets/spree/backend/all.css', " *= require spree/backend/spree_admin_bar\n", :before => /\*\//, :verbose => true
       end
 
       def add_migrations
diff --git a/spree_admin_bar.gemspec b/spree_admin_bar.gemspec
index eb02284..f205ee0 100644
--- a/spree_admin_bar.gemspec
+++ b/spree_admin_bar.gemspec
@@ -16,7 +16,6 @@ Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.requirements << 'none'
 
-  s.add_dependency 'spree_core', '~> 2.1.0'
 
   s.add_development_dependency 'capybara', '~> 2.1'
   s.add_development_dependency 'coffee-rails'