diff --git a/lib/generators/guard/scaffold/scaffold_generator.rb b/lib/generators/guard/scaffold/scaffold_generator.rb
index 9f42f1c..70e1ae9 100644
--- a/lib/generators/guard/scaffold/scaffold_generator.rb
+++ b/lib/generators/guard/scaffold/scaffold_generator.rb
@@ -3,12 +3,17 @@ module Guard
   class ScaffoldGenerator < Rails::Generators::NamedBase
     include Rails::Generators::ResourceHelpers
 
-    source_root File.expand_path('../templates', __FILE__)
+    source_root File.expand_path('../../templates', __FILE__)
     
 #    check_class_collision :suffix => "Guard"
     
     def create_guard_files
       template 'guard.yml', File.join('app', 'guards', class_path, "#{plural_file_name}_guard.yml")
     end
+ 
+    #TODO should be coming from the actual generator
+    def actions
+      ['index', 'show', 'new', 'create', 'edit', 'update', 'destroy']
+    end
   end
 end
diff --git a/lib/generators/guard/scaffold/templates/guard.rb b/lib/generators/guard/scaffold/templates/guard.rb
deleted file mode 100644
index 59589ce..0000000
--- a/lib/generators/guard/scaffold/templates/guard.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class <%= guard_class_name %>Guard
-  def initialize(guard)
-    #guard.name = "<%= plural_file_name %>"
-<% if aliases -%>
-    guard.aliases = <%= aliases.inspect %>
-<% end -%>
-    guard.action_map= {
-<% case actions
-   when Array
-     for action in actions -%>
-       :<%= action %> => [],
-<%   end 
-   when Hash
-     actions.each do |action, groups| -%>
-      :<%= action %> => <%= groups.inspect %>,
-<%   end
-   end -%>
-    }
-  end
-end
diff --git a/lib/generators/guard/templates/guard.rb b/lib/generators/guard/templates/guard.rb
deleted file mode 100644
index 59589ce..0000000
--- a/lib/generators/guard/templates/guard.rb
+++ /dev/null
@@ -1,20 +0,0 @@
-class <%= guard_class_name %>Guard
-  def initialize(guard)
-    #guard.name = "<%= plural_file_name %>"
-<% if aliases -%>
-    guard.aliases = <%= aliases.inspect %>
-<% end -%>
-    guard.action_map= {
-<% case actions
-   when Array
-     for action in actions -%>
-       :<%= action %> => [],
-<%   end 
-   when Hash
-     actions.each do |action, groups| -%>
-      :<%= action %> => <%= groups.inspect %>,
-<%   end
-   end -%>
-    }
-  end
-end
diff --git a/templates/ixtlan-guard.template b/templates/ixtlan-guard.template
index 27b9e3e..5f6008b 100644
--- a/templates/ixtlan-guard.template
+++ b/templates/ixtlan-guard.template
@@ -3,4 +3,5 @@
 gem 'ruby-maven', '0.8.3.0.3.0.28.3'
 gem 'ixtlan-guard', :path => '../..'
 gem 'ixtlan-core' # since rmvn can not resolve it from 'ixtlan-guard'
+gem 'ixtlan-generators'
 # vim: syntax=Ruby