10 files changed, 5 insertions, 5 deletions
diff --git a/lib/efl/ecore/ecore_getopt.rb b/lib/efl/ecore/ecore_getopt.rb
index 34c4539..be4a958 100644
--- a/lib/efl/ecore/ecore_getopt.rb
+++ b/lib/efl/ecore/ecore_getopt.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/ecore_getopt'
+require 'efl/ffi/ecore/ecore_getopt'
 #
 module Efl
     module FFI
diff --git a/lib/efl/eina.rb b/lib/efl/eina.rb
index 5141853..e5fcc67 100644
--- a/lib/efl/eina.rb
+++ b/lib/efl/eina.rb
@@ -1,6 +1,6 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ffi/eina_main'
+require 'efl/ffi/eina'
 #
 # EOF
diff --git a/lib/efl/eina/eina_list.rb b/lib/efl/eina/eina_list.rb
index 823fe72..fdbc176 100644
--- a/lib/efl/eina/eina_list.rb
+++ b/lib/efl/eina/eina_list.rb
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 #
 require 'efl/eina'
-require 'efl/ffi/eina_list'
+require 'efl/ffi/eina/eina_list'
 #
 class Array
     def self.from_eina_list o
diff --git a/lib/efl/ffi.rb b/lib/efl/ffi.rb
index 9687d99..fc1a4d6 100644
--- a/lib/efl/ffi.rb
+++ b/lib/efl/ffi.rb
@@ -74,6 +74,6 @@ module Efl
     end
 end
 #
-require 'efl/ffi/eina_types'
+require 'efl/ffi/eina/eina_types'
 #
 # EOF
diff --git a/lib/efl/ffi/ecore_evas.rb b/lib/efl/ffi/ecore/ecore_evas.rb
index 5fec9be..9963a96 100644
--- a/lib/efl/ffi/ecore_evas.rb
+++ b/lib/efl/ffi/ecore/ecore_evas.rb
@@ -5,7 +5,7 @@ require 'efl/ffi'
 #
 module Efl
     #
-    module Ecore_evas
+    module EcoreEvas
         def self.method_missing m, *args, &block
             return Efl::FFI.send 'ecore_'+m.to_s, *args, &block
         end
diff --git a/lib/efl/ffi/ecore_getopt.rb b/lib/efl/ffi/ecore/ecore_getopt.rb
index 40cd81d..40cd81d 100644
--- a/lib/efl/ffi/ecore_getopt.rb
+++ b/lib/efl/ffi/ecore/ecore_getopt.rb
diff --git a/lib/efl/ffi/ecore_input.rb b/lib/efl/ffi/ecore/ecore_input.rb
index e88e7fb..e88e7fb 100644
--- a/lib/efl/ffi/ecore_input.rb
+++ b/lib/efl/ffi/ecore/ecore_input.rb
diff --git a/lib/efl/ffi/eina_main.rb b/lib/efl/ffi/eina.rb
index 6d09164..6d09164 100644
--- a/lib/efl/ffi/eina_main.rb
+++ b/lib/efl/ffi/eina.rb
diff --git a/lib/efl/ffi/eina_list.rb b/lib/efl/ffi/eina/eina_list.rb
index 12001c6..12001c6 100644
--- a/lib/efl/ffi/eina_list.rb
+++ b/lib/efl/ffi/eina/eina_list.rb
diff --git a/lib/efl/ffi/eina_types.rb b/lib/efl/ffi/eina/eina_types.rb
index 5a5dd4d..5a5dd4d 100644
--- a/lib/efl/ffi/eina_types.rb
+++ b/lib/efl/ffi/eina/eina_types.rb