diff --git a/Guardfile b/Guardfile
index 5781319..2a31deb 100644
--- a/Guardfile
+++ b/Guardfile
@@ -19,7 +19,7 @@ group :rspec do
     watch(%r{^spec/helpers/(.+)\.rb$})   { all_specs }
     watch(%r{^libraries/pacemaker\.rb$}) { all_specs }
     watch(%r{^spec/.+_spec\.rb$})
-    watch(%r{^libraries/pacemaker/(.+)\.rb$})  { |m|
+    watch(%r{^libraries/(.+)\.rb$})  { |m|
       "spec/libraries/#{m[1]}_spec.rb"
     }
     watch(%r{^(resources|providers)/(.+)\.rb$}) { |m|
diff --git a/spec/libraries/cib_object_spec.rb b/spec/libraries/pacemaker/cib_object_spec.rb
similarity index 95%
rename from spec/libraries/cib_object_spec.rb
rename to spec/libraries/pacemaker/cib_object_spec.rb
index eed83f9..e92ecb7 100644
--- a/spec/libraries/cib_object_spec.rb
+++ b/spec/libraries/pacemaker/cib_object_spec.rb
@@ -1,8 +1,8 @@
 require 'spec_helper'
 require 'mixlib/shellout'
 
-require_relative File.join(%w(.. .. libraries pacemaker))
-require_relative File.join(%w(.. helpers keystone_primitive))
+require_relative File.join(%w(.. .. .. libraries pacemaker))
+require_relative File.join(%w(.. .. helpers keystone_primitive))
 
 describe Pacemaker::CIBObject do
 
diff --git a/spec/libraries/primitive_spec.rb b/spec/libraries/pacemaker/resource/primitive_spec.rb
similarity index 95%
rename from spec/libraries/primitive_spec.rb
rename to spec/libraries/pacemaker/resource/primitive_spec.rb
index f722dd0..4d8a198 100644
--- a/spec/libraries/primitive_spec.rb
+++ b/spec/libraries/pacemaker/resource/primitive_spec.rb
@@ -1,6 +1,6 @@
 require 'spec_helper'
-require_relative File.join(%w(.. .. libraries pacemaker resource primitive))
-require_relative File.join(%w(.. helpers keystone_primitive))
+require_relative File.join(%w(.. .. .. .. libraries pacemaker resource primitive))
+require_relative File.join(%w(.. .. .. helpers keystone_primitive))
 
 describe Pacemaker::Resource::Primitive do
   before(:each) do
diff --git a/spec/libraries/resource_spec.rb b/spec/libraries/pacemaker/resource_spec.rb
similarity index 91%
rename from spec/libraries/resource_spec.rb
rename to spec/libraries/pacemaker/resource_spec.rb
index a203449..e9572a1 100644
--- a/spec/libraries/resource_spec.rb
+++ b/spec/libraries/pacemaker/resource_spec.rb
@@ -1,5 +1,5 @@
 require 'spec_helper'
-require_relative File.join(%w(.. .. libraries pacemaker resource))
+require_relative File.join(%w(.. .. .. libraries pacemaker resource))
 
 describe Pacemaker::Resource do
   describe "#running?" do