move generated ffi files into lib/efl/ffi

17 files changed, 12 insertions, 471 deletions

diff --git a/lib/efl/ecore.rb b/lib/efl/ecore.rb
index 5a8597a..4e6a4e9 100644
--- a/lib/efl/ecore.rb
+++ b/lib/efl/ecore.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ecore/ecore-ffi'
+require 'efl/ffi/ecore'
 #
 module Efl
     module Ecore
diff --git a/lib/efl/ecore_getopt.rb b/lib/efl/ecore_getopt.rb
index 10074b5..ee8767f 100644
--- a/lib/efl/ecore_getopt.rb
+++ b/lib/efl/ecore_getopt.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/ecore/ecore_getopt-ffi'
+require 'efl/ffi/ecore_getopt'
 #
 module Efl
     module API
diff --git a/lib/efl/edje.rb b/lib/efl/edje.rb
index 35f3d42..cee5f8e 100644
--- a/lib/efl/edje.rb
+++ b/lib/efl/edje.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/edje/edje-ffi'
+require 'efl/ffi/edje'
 #
 module Efl
     module Edje
diff --git a/lib/efl/edje/edje-ffi.rb b/lib/efl/edje/edje-ffi.rb
deleted file mode 100644
index ef4cb1a..0000000
--- a/lib/efl/edje/edje-ffi.rb
+++ /dev/null
@@ -1,459 +0,0 @@
-#! /usr/bin/env ruby
-# -*- coding: UTF-8 -*-
-#
-require 'efl/ffi'
-#
-module Efl
-    #
-    module Edje
-        def self.method_missing m, *args, &block
-            return Efl::API.send 'edje_'+m.to_s, *args, &block
-        end
-    end
-    #
-    module API
-        #
-        #
-        ffi_lib 'edje'
-        #
-        # ENUMS
-        # typedef enum _Edje_Message_Type {...} Edje_Message_Type;
-        enum :edje_message_type, [ :edje_message_none, 0, :edje_message_signal, 1, :edje_message_string, 2, :edje_message_int, 3, :edje_message_float,
-            4, :edje_message_string_set, 5, :edje_message_int_set, 6, :edje_message_float_set, 7, :edje_message_string_int, 8, :edje_message_string_float, 9,
-            :edje_message_string_int_set, 1, :edje_message_string_float_set, 1 ]
-        # typedef enum _Edje_Aspect_Control {...} Edje_Aspect_Control;
-        enum :edje_aspect_control, [ :edje_aspect_control_none, 0, :edje_aspect_control_neither, 1, :edje_aspect_control_horizontal, 2,
-            :edje_aspect_control_vertical, 3, :edje_aspect_control_both, 4 ]
-        # typedef enum _Edje_Object_Table_Homogeneous_Mode {...} Edje_Object_Table_Homogeneous_Mode;
-        enum :edje_object_table_homogeneous_mode, [ :edje_object_table_homogeneous_none, 0, :edje_object_table_homogeneous_table, 1,
-            :edje_object_table_homogeneous_item, 2 ]
-        # typedef enum _Edje_Part_Type {...} Edje_Part_Type;
-        enum :edje_part_type, [ :edje_part_type_none, 0, :edje_part_type_rectangle, 1, :edje_part_type_text, 2, :edje_part_type_image, 3,
-            :edje_part_type_swallow, 4, :edje_part_type_textblock, 5, :edje_part_type_gradient, 6, :edje_part_type_group, 7, :edje_part_type_box, 8,
-            :edje_part_type_table, 9, :edje_part_type_external, 1, :edje_part_type_proxy, 1, :edje_part_type_last, 1 ]
-        # typedef enum _Edje_Text_Effect {...} Edje_Text_Effect;
-        enum :edje_text_effect, [ :edje_text_effect_none, 0, :edje_text_effect_plain, 1, :edje_text_effect_outline, 2, :edje_text_effect_soft_outline,
-            3, :edje_text_effect_shadow, 4, :edje_text_effect_soft_shadow, 5, :edje_text_effect_outline_shadow, 6, :edje_text_effect_outline_soft_shadow, 7,
-            :edje_text_effect_far_shadow, 8, :edje_text_effect_far_soft_shadow, 9, :edje_text_effect_glow, 1, :edje_text_effect_last, 1,
-            :edje_text_effect_shadow_direction_bottom_right, :edje_text_effect_shadow_direction_bottom, :edje_text_effect_shadow_direction_bottom_left,
-            :edje_text_effect_shadow_direction_left, :edje_text_effect_shadow_direction_top_left, :edje_text_effect_shadow_direction_top,
-            :edje_text_effect_shadow_direction_top_right, :edje_text_effect_shadow_direction_right ]
-        # typedef enum _Edje_Action_Type {...} Edje_Action_Type;
-        enum :edje_action_type, [ :edje_action_type_none, 0, :edje_action_type_state_set, 1, :edje_action_type_action_stop, 2,
-            :edje_action_type_signal_emit, 3, :edje_action_type_drag_val_set, 4, :edje_action_type_drag_val_step, 5, :edje_action_type_drag_val_page, 6,
-            :edje_action_type_script, 7, :edje_action_type_focus_set, 8, :edje_action_type_reserved00, 9, :edje_action_type_focus_object, 1,
-            :edje_action_type_param_copy, 1, :edje_action_type_param_set, 1, :edje_action_type_last, 1 ]
-        # typedef enum _Edje_Tween_Mode {...} Edje_Tween_Mode;
-        enum :edje_tween_mode, [ :edje_tween_mode_none, 0, :edje_tween_mode_linear, 1, :edje_tween_mode_sinusoidal, 2, :edje_tween_mode_accelerate, 3,
-            :edje_tween_mode_decelerate, 4, :edje_tween_mode_last, 5 ]
-        # typedef enum _Edje_Cursor {...} Edje_Cursor;
-        enum :edje_cursor, [ :edje_cursor_main, :edje_cursor_selection_begin, :edje_cursor_selection_end, :edje_cursor_preedit_start,
-            :edje_cursor_preedit_end, :edje_cursor_user, :edje_cursor_user_extra ]
-        # typedef enum _Edje_Drag_Dir {...} Edje_Drag_Dir;
-        enum :edje_drag_dir, [ :edje_drag_dir_none, 0, :edje_drag_dir_x, 1, :edje_drag_dir_y, 2, :edje_drag_dir_xy, 3 ]
-        # typedef enum _Edje_Load_Error {...} Edje_Load_Error;
-        enum :edje_load_error, [ :edje_load_error_none, 0, :edje_load_error_generic, 1, :edje_load_error_does_not_exist, 2,
-            :edje_load_error_permission_denied, 3, :edje_load_error_resource_allocation_failed, 4, :edje_load_error_corrupt_file, 5,
-            :edje_load_error_unknown_format, 6, :edje_load_error_incompatible_file, 7, :edje_load_error_unknown_collection, 8,
-            :edje_load_error_recursive_reference, 9 ]
-        # typedef enum _Edje_Text_Filter_Type {...} Edje_Text_Filter_Type;
-        enum :edje_text_filter_type, [ :edje_text_filter_text, 0, :edje_text_filter_format, 1, :edje_text_filter_markup, 2 ]
-        # typedef enum _Edje_External_Param_Type {...} Edje_External_Param_Type;
-        enum :edje_external_param_type, [ :edje_external_param_type_int, :edje_external_param_type_double, :edje_external_param_type_string,
-            :edje_external_param_type_bool, :edje_external_param_type_choice, :edje_external_param_type_max ]
-        # typedef enum _Edje_External_Param_Flags {...} Edje_External_Param_Flags;
-        enum :edje_external_param_flags, [ :edje_external_param_flags_none, 0, :edje_external_param_flags_get, :edje_external_param_flags_set,
-            :edje_external_param_flags_state, :edje_external_param_flags_constructor, :edje_external_param_flags_regular, :edje_external_param_flags_set,
-            :edje_external_param_flags_state ]
-        #
-        # TYPEDEFS
-        # typedef struct _Edje_Version Edje_Version;
-        typedef :pointer, :edje_version
-        # typedef struct _Edje_Message_String Edje_Message_String;
-        typedef :pointer, :edje_message_string
-        # typedef struct _Edje_Message_Int Edje_Message_Int;
-        typedef :pointer, :edje_message_int
-        # typedef struct _Edje_Message_Float Edje_Message_Float;
-        typedef :pointer, :edje_message_float
-        # typedef struct _Edje_Message_String_Set Edje_Message_String_Set;
-        typedef :pointer, :edje_message_string_set
-        # typedef struct _Edje_Message_Int_Set Edje_Message_Int_Set;
-        typedef :pointer, :edje_message_int_set
-        # typedef struct _Edje_Message_Float_Set Edje_Message_Float_Set;
-        typedef :pointer, :edje_message_float_set
-        # typedef struct _Edje_Message_String_Int Edje_Message_String_Int;
-        typedef :pointer, :edje_message_string_int
-        # typedef struct _Edje_Message_String_Float Edje_Message_String_Float;
-        typedef :pointer, :edje_message_string_float
-        # typedef struct _Edje_Message_String_Int_Set Edje_Message_String_Int_Set;
-        typedef :pointer, :edje_message_string_int_set
-        # typedef struct _Edje_Message_String_Float_Set Edje_Message_String_Float_Set;
-        typedef :pointer, :edje_message_string_float_set
-        # typedef struct _Edje_External_Param Edje_External_Param;
-        typedef :pointer, :edje_external_param
-        typedef :pointer, :edje_external_param_p
-        # typedef struct _Edje_External_Param_Info Edje_External_Param_Info;
-        typedef :pointer, :edje_external_param_info
-        typedef :pointer, :edje_external_param_info_p
-        # typedef struct _Edje_External_Type Edje_External_Type;
-        typedef :pointer, :edje_external_type
-        typedef :pointer, :edje_external_type_p
-        # typedef struct _Edje_External_Type_Info Edje_External_Type_Info;
-        typedef :pointer, :edje_external_type_info
-        typedef :pointer, :edje_external_type_info_p
-        # typedef struct _Edje_Perspective Edje_Perspective;
-        typedef :pointer, :edje_perspective
-        typedef :pointer, :edje_perspective_p
-        #
-        # CALLBACKS
-        # typedef void (*Edje_Signal_Cb) (void *data, Evas_Object *obj, const char *emission, const char *source);
-        callback :edje_signal_cb, [ :void_p, :evas_object_p, :string, :string ], :void
-        # typedef void (*Edje_Text_Change_Cb) (void *data, Evas_Object *obj, const char *part);
-        callback :edje_text_change_cb, [ :void_p, :evas_object_p, :string ], :void
-        # typedef void (*Edje_Message_Handler_Cb) (void *data, Evas_Object *obj, Edje_Message_Type type, int id, void *msg);
-        callback :edje_message_handler_cb, [ :void_p, :evas_object_p, :edje_message_type, :int, :void_p ], :void
-        # typedef void (*Edje_Text_Filter_Cb) (void *data, Evas_Object *obj, const char *part, Edje_Text_Filter_Type type, char **text);
-        callback :edje_text_filter_cb, [ :void_p, :evas_object_p, :string, :edje_text_filter_type, :string_array ], :void
-        # typedef Evas_Object *(*Edje_Item_Provider_Cb) (void *data, Evas_Object *obj, const char *part, const char *item);
-        callback :edje_item_provider_cb, [ :void_p, :evas_object_p, :string, :string ], :evas_object_p
-        #
-        # FUNCTIONS
-        fcts = [
-        # EAPI extern Edje_Version *edje_version;
-        # FIXME
-        # EAPI const char *edje_external_param_type_str(Edje_External_Param_Type type) EINA_PURE;
-        [ :edje_external_param_type_str, [ :edje_external_param_type ], :string ],
-        # EAPI int edje_init (void);
-        [ :edje_init, [  ], :int ],
-        # EAPI int edje_shutdown (void);
-        [ :edje_shutdown, [  ], :int ],
-        # EAPI void edje_frametime_set (double t);
-        [ :edje_frametime_set, [ :double ], :void ],
-        # EAPI double edje_frametime_get (void);
-        [ :edje_frametime_get, [  ], :double ],
-        # EAPI void edje_freeze (void);
-        [ :edje_freeze, [  ], :void ],
-        # EAPI void edje_thaw (void);
-        [ :edje_thaw, [  ], :void ],
-        # EAPI void edje_fontset_append_set (const char *fonts);
-        [ :edje_fontset_append_set, [ :string ], :void ],
-        # EAPI const char *edje_fontset_append_get (void);
-        [ :edje_fontset_append_get, [  ], :string ],
-        # EAPI void edje_scale_set (double scale);
-        [ :edje_scale_set, [ :double ], :void ],
-        # EAPI double edje_scale_get (void);
-        [ :edje_scale_get, [  ], :double ],
-        # EAPI Eina_Bool edje_object_scale_set (Evas_Object *obj, double scale);
-        [ :edje_object_scale_set, [ :evas_object_p, :double ], :eina_bool ],
-        # EAPI double edje_object_scale_get (const Evas_Object *obj);
-        [ :edje_object_scale_get, [ :evas_object_p ], :double ],
-        # EAPI void edje_object_mirrored_set (Evas_Object *obj, Eina_Bool rtl);
-        [ :edje_object_mirrored_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool edje_object_mirrored_get (const Evas_Object *obj);
-        [ :edje_object_mirrored_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI Eina_List *edje_file_collection_list (const char *file);
-        [ :edje_file_collection_list, [ :string ], :eina_list_p ],
-        # EAPI void edje_file_collection_list_free (Eina_List *lst);
-        [ :edje_file_collection_list_free, [ :eina_list_p ], :void ],
-        # EAPI Eina_Bool edje_file_group_exists (const char *file, const char *glob);
-        [ :edje_file_group_exists, [ :string, :string ], :eina_bool ],
-        # EAPI char *edje_file_data_get (const char *file, const char *key);
-        [ :edje_file_data_get, [ :string, :string ], :string ],
-        # EAPI void edje_file_cache_set (int count);
-        [ :edje_file_cache_set, [ :int ], :void ],
-        # EAPI int edje_file_cache_get (void);
-        [ :edje_file_cache_get, [  ], :int ],
-        # EAPI void edje_file_cache_flush (void);
-        [ :edje_file_cache_flush, [  ], :void ],
-        # EAPI void edje_collection_cache_set (int count);
-        [ :edje_collection_cache_set, [ :int ], :void ],
-        # EAPI int edje_collection_cache_get (void);
-        [ :edje_collection_cache_get, [  ], :int ],
-        # EAPI void edje_collection_cache_flush (void);
-        [ :edje_collection_cache_flush, [  ], :void ],
-        # EAPI Eina_Bool edje_color_class_set (const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
-        [ :edje_color_class_set, [ :string, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int ], :eina_bool ],
-        # EAPI Eina_Bool edje_color_class_get (const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
-        [ :edje_color_class_get, [ :string, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p ],
-            :eina_bool ],
-        # EAPI void edje_color_class_del (const char *color_class);
-        [ :edje_color_class_del, [ :string ], :void ],
-        # EAPI Eina_List *edje_color_class_list (void);
-        [ :edje_color_class_list, [  ], :eina_list_p ],
-        # EAPI Eina_Bool edje_text_class_set (const char *text_class, const char *font, Evas_Font_Size size);
-        [ :edje_text_class_set, [ :string, :string, :int ], :eina_bool ],
-        # EAPI void edje_text_class_del (const char *text_class);
-        [ :edje_text_class_del, [ :string ], :void ],
-        # EAPI Eina_List *edje_text_class_list (void);
-        [ :edje_text_class_list, [  ], :eina_list_p ],
-        # EAPI void edje_extern_object_min_size_set (Evas_Object *obj, Evas_Coord minw, Evas_Coord minh);
-        [ :edje_extern_object_min_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void edje_extern_object_max_size_set (Evas_Object *obj, Evas_Coord maxw, Evas_Coord maxh);
-        [ :edje_extern_object_max_size_set, [ :evas_object_p, :int, :int ], :void ],
-        # EAPI void edje_extern_object_aspect_set (Evas_Object *obj, Edje_Aspect_Control aspect, Evas_Coord aw, Evas_Coord ah);
-        [ :edje_extern_object_aspect_set, [ :evas_object_p, :edje_aspect_control, :int, :int ], :void ],
-        # EAPI void edje_box_layout_register (const char *name, Evas_Object_Box_Layout func, void *(*layout_data_get)(void *), void (*layout_data_free)(void *), void (*free_data)(void *), void *data);
-        # FIXME
-        # EAPI Evas_Object *edje_object_add (Evas *evas);
-        [ :edje_object_add, [ :evas_p ], :evas_object_p ],
-        # EAPI const char *edje_object_data_get (const Evas_Object *obj, const char *key);
-        [ :edje_object_data_get, [ :evas_object_p, :string ], :string ],
-        # EAPI Eina_Bool edje_object_file_set (Evas_Object *obj, const char *file, const char *group);
-        [ :edje_object_file_set, [ :evas_object_p, :string, :string ], :eina_bool ],
-        # EAPI void edje_object_file_get (const Evas_Object *obj, const char **file, const char **group);
-        [ :edje_object_file_get, [ :evas_object_p, :string_array, :string_array ], :void ],
-        # EAPI Edje_Load_Error edje_object_load_error_get (const Evas_Object *obj);
-        [ :edje_object_load_error_get, [ :evas_object_p ], :edje_load_error ],
-        # EAPI const char *edje_load_error_str (Edje_Load_Error error);
-        [ :edje_load_error_str, [ :edje_load_error ], :string ],
-        # EAPI Eina_Bool edje_object_preload (Evas_Object *obj, Eina_Bool cancel);
-        [ :edje_object_preload, [ :evas_object_p, :eina_bool ], :eina_bool ],
-        # EAPI void edje_object_signal_callback_add (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
-        [ :edje_object_signal_callback_add, [ :evas_object_p, :string, :string, :edje_signal_cb, :void_p ], :void ],
-        # EAPI void *edje_object_signal_callback_del (Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func);
-        [ :edje_object_signal_callback_del, [ :evas_object_p, :string, :string, :edje_signal_cb ], :void_p ],
-        # EAPI void *edje_object_signal_callback_del_full(Evas_Object *obj, const char *emission, const char *source, Edje_Signal_Cb func, void *data);
-        [ :edje_object_signal_callback_del_full, [ :evas_object_p, :string, :string, :edje_signal_cb, :void_p ], :void_p ],
-        # EAPI void edje_object_signal_emit (Evas_Object *obj, const char *emission, const char *source);
-        [ :edje_object_signal_emit, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI void edje_object_play_set (Evas_Object *obj, Eina_Bool play);
-        [ :edje_object_play_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool edje_object_play_get (const Evas_Object *obj);
-        [ :edje_object_play_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI void edje_object_animation_set (Evas_Object *obj, Eina_Bool on);
-        [ :edje_object_animation_set, [ :evas_object_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool edje_object_animation_get (const Evas_Object *obj);
-        [ :edje_object_animation_get, [ :evas_object_p ], :eina_bool ],
-        # EAPI int edje_object_freeze (Evas_Object *obj);
-        [ :edje_object_freeze, [ :evas_object_p ], :int ],
-        # EAPI int edje_object_thaw (Evas_Object *obj);
-        [ :edje_object_thaw, [ :evas_object_p ], :int ],
-        # EAPI Eina_Bool edje_object_color_class_set (Evas_Object *obj, const char *color_class, int r, int g, int b, int a, int r2, int g2, int b2, int a2, int r3, int g3, int b3, int a3);
-        [ :edje_object_color_class_set, [ :evas_object_p, :string, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int, :int ],
-            :eina_bool ],
-        # EAPI Eina_Bool edje_object_color_class_get (const Evas_Object *o, const char *color_class, int *r, int *g, int *b, int *a, int *r2, int *g2, int *b2, int *a2, int *r3, int *g3, int *b3, int *a3);
-        [ :edje_object_color_class_get, [ :evas_object_p, :string, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p, :int_p,
-            :int_p, :int_p ], :eina_bool ],
-        # EAPI void edje_object_color_class_del (Evas_Object *obj, const char *color_class);
-        [ :edje_object_color_class_del, [ :evas_object_p, :string ], :void ],
-        # EAPI Eina_Bool edje_object_text_class_set (Evas_Object *obj, const char *text_class, const char *font, Evas_Font_Size size);
-        [ :edje_object_text_class_set, [ :evas_object_p, :string, :string, :int ], :eina_bool ],
-        # EAPI void edje_object_size_min_get (const Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-        [ :edje_object_size_min_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void edje_object_size_max_get (const Evas_Object *obj, Evas_Coord *maxw, Evas_Coord *maxh);
-        [ :edje_object_size_max_get, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI void edje_object_calc_force (Evas_Object *obj);
-        [ :edje_object_calc_force, [ :evas_object_p ], :void ],
-        # EAPI void edje_object_size_min_calc (Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh);
-        [ :edje_object_size_min_calc, [ :evas_object_p, :int_p, :int_p ], :void ],
-        # EAPI Eina_Bool edje_object_parts_extends_calc (Evas_Object *obj, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :edje_object_parts_extends_calc, [ :evas_object_p, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
-        # EAPI void edje_object_size_min_restricted_calc(Evas_Object *obj, Evas_Coord *minw, Evas_Coord *minh, Evas_Coord restrictedw, Evas_Coord restrictedh);
-        [ :edje_object_size_min_restricted_calc, [ :evas_object_p, :int_p, :int_p, :int, :int ], :void ],
-        # EAPI Eina_Bool edje_object_part_exists (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_exists, [ :evas_object_p, :string ], :eina_bool ],
-        # EAPI const Evas_Object *edje_object_part_object_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_object_get, [ :evas_object_p, :string ], :evas_object_p ],
-        # EAPI Eina_Bool edje_object_part_geometry_get (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :edje_object_part_geometry_get, [ :evas_object_p, :string, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
-        # EAPI void edje_object_item_provider_set (Evas_Object *obj, Edje_Item_Provider_Cb func, void *data);
-        [ :edje_object_item_provider_set, [ :evas_object_p, :edje_item_provider_cb, :void_p ], :void ],
-        # EAPI void edje_object_text_change_cb_set (Evas_Object *obj, Edje_Text_Change_Cb func, void *data);
-        [ :edje_object_text_change_cb_set, [ :evas_object_p, :edje_text_change_cb, :void_p ], :void ],
-        # EAPI Eina_Bool edje_object_part_text_set (Evas_Object *obj, const char *part, const char *text);
-        [ :edje_object_part_text_set, [ :evas_object_p, :string, :string ], :eina_bool ],
-        # EAPI const char *edje_object_part_text_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_get, [ :evas_object_p, :string ], :string ],
-        # EAPI Eina_Bool edje_object_part_text_unescaped_set (Evas_Object *obj, const char *part, const char *text_to_escape);
-        [ :edje_object_part_text_unescaped_set, [ :evas_object_p, :string, :string ], :eina_bool ],
-        # EAPI char *edje_object_part_text_unescaped_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_unescaped_get, [ :evas_object_p, :string ], :string ],
-        # EAPI const char *edje_object_part_text_selection_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_selection_get, [ :evas_object_p, :string ], :string ],
-        # EAPI void edje_object_part_text_select_none (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_none, [ :evas_object_p, :string ], :void ],
-        # EAPI void edje_object_part_text_select_all (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_all, [ :evas_object_p, :string ], :void ],
-        # EAPI void edje_object_part_text_insert (Evas_Object *obj, const char *part, const char *text);
-        [ :edje_object_part_text_insert, [ :evas_object_p, :string, :string ], :void ],
-        # EAPI const Eina_List *edje_object_part_text_anchor_list_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_anchor_list_get, [ :evas_object_p, :string ], :eina_list_p ],
-        # EAPI const Eina_List *edje_object_part_text_anchor_geometry_get (const Evas_Object *obj, const char *part, const char *anchor);
-        [ :edje_object_part_text_anchor_geometry_get, [ :evas_object_p, :string, :string ], :eina_list_p ],
-        # EAPI const Eina_List *edje_object_part_text_item_list_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_item_list_get, [ :evas_object_p, :string ], :eina_list_p ],
-        # EAPI Eina_Bool edje_object_part_text_item_geometry_get (const Evas_Object *obj, const char *part, const char *item, Evas_Coord *cx, Evas_Coord *cy, Evas_Coord *cw, Evas_Coord *ch);
-        [ :edje_object_part_text_item_geometry_get, [ :evas_object_p, :string, :string, :int_p, :int_p, :int_p, :int_p ], :eina_bool ],
-        # EAPI void edje_object_part_text_cursor_geometry_get (const Evas_Object *obj, const char *part, Evas_Coord *x, Evas_Coord *y, Evas_Coord *w, Evas_Coord *h);
-        [ :edje_object_part_text_cursor_geometry_get, [ :evas_object_p, :string, :int_p, :int_p, :int_p, :int_p ], :void ],
-        # EAPI void edje_object_part_text_select_allow_set (const Evas_Object *obj, const char *part, Eina_Bool allow);
-        [ :edje_object_part_text_select_allow_set, [ :evas_object_p, :string, :eina_bool ], :void ],
-        # EAPI void edje_object_part_text_select_abort (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_abort, [ :evas_object_p, :string ], :void ],
-        # EAPI void edje_object_part_text_select_begin (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_begin, [ :evas_object_p, :string ], :void ],
-        # EAPI void edje_object_part_text_select_extend (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_text_select_extend, [ :evas_object_p, :string ], :void ],
-        # EAPI Eina_Bool edje_object_part_text_cursor_next (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_next, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_text_cursor_prev (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_prev, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_text_cursor_up (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_up, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_text_cursor_down (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_down, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
-        # EAPI void edje_object_part_text_cursor_begin_set (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_begin_set, [ :evas_object_p, :string, :edje_cursor ], :void ],
-        # EAPI void edje_object_part_text_cursor_end_set (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_end_set, [ :evas_object_p, :string, :edje_cursor ], :void ],
-        # EAPI void edje_object_part_text_cursor_copy (Evas_Object *obj, const char *part, Edje_Cursor src, Edje_Cursor dst);
-        [ :edje_object_part_text_cursor_copy, [ :evas_object_p, :string, :edje_cursor, :edje_cursor ], :void ],
-        # EAPI void edje_object_part_text_cursor_line_begin_set (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_line_begin_set, [ :evas_object_p, :string, :edje_cursor ], :void ],
-        # EAPI void edje_object_part_text_cursor_line_end_set (Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_line_end_set, [ :evas_object_p, :string, :edje_cursor ], :void ],
-        # EAPI Eina_Bool edje_object_part_text_cursor_coord_set (Evas_Object *obj, const char *part, Edje_Cursor cur, Evas_Coord x, Evas_Coord y);
-        [ :edje_object_part_text_cursor_coord_set, [ :evas_object_p, :string, :edje_cursor, :int, :int ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_text_cursor_is_format_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_is_format_get, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_text_cursor_is_visible_format_get(const Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_is_visible_format_get, [ :evas_object_p, :string, :edje_cursor ], :eina_bool ],
-        # EAPI const char *edje_object_part_text_cursor_content_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_content_get, [ :evas_object_p, :string, :edje_cursor ], :string ],
-        # EAPI void edje_object_part_text_cursor_pos_set (Evas_Object *obj, const char *part, Edje_Cursor cur, int pos);
-        [ :edje_object_part_text_cursor_pos_set, [ :evas_object_p, :string, :edje_cursor, :int ], :void ],
-        # EAPI int edje_object_part_text_cursor_pos_get (const Evas_Object *obj, const char *part, Edje_Cursor cur);
-        [ :edje_object_part_text_cursor_pos_get, [ :evas_object_p, :string, :edje_cursor ], :int ],
-        # EAPI void edje_object_text_insert_filter_callback_add (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data);
-        [ :edje_object_text_insert_filter_callback_add, [ :evas_object_p, :string, :edje_text_filter_cb, :void_p ], :void ],
-        # EAPI void *edje_object_text_insert_filter_callback_del (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func);
-        [ :edje_object_text_insert_filter_callback_del, [ :evas_object_p, :string, :edje_text_filter_cb ], :void_p ],
-        # EAPI void *edje_object_text_insert_filter_callback_del_full (Evas_Object *obj, const char *part, Edje_Text_Filter_Cb func, void *data);
-        [ :edje_object_text_insert_filter_callback_del_full, [ :evas_object_p, :string, :edje_text_filter_cb, :void_p ], :void_p ],
-        # EAPI Eina_Bool edje_object_part_swallow (Evas_Object *obj, const char *part, Evas_Object *obj_swallow);
-        [ :edje_object_part_swallow, [ :evas_object_p, :string, :evas_object_p ], :eina_bool ],
-        # EAPI void edje_object_part_unswallow (Evas_Object *obj, Evas_Object *obj_swallow);
-        [ :edje_object_part_unswallow, [ :evas_object_p, :evas_object_p ], :void ],
-        # EAPI Evas_Object *edje_object_part_swallow_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_swallow_get, [ :evas_object_p, :string ], :evas_object_p ],
-        # EAPI const char *edje_object_part_state_get (const Evas_Object *obj, const char *part, double *val_ret);
-        [ :edje_object_part_state_get, [ :evas_object_p, :string, :double_p ], :string ],
-        # EAPI Edje_Drag_Dir edje_object_part_drag_dir_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_drag_dir_get, [ :evas_object_p, :string ], :edje_drag_dir ],
-        # EAPI Eina_Bool edje_object_part_drag_value_set (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_value_set, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_value_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
-        [ :edje_object_part_drag_value_get, [ :evas_object_p, :string, :double_p, :double_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_size_set (Evas_Object *obj, const char *part, double dw, double dh);
-        [ :edje_object_part_drag_size_set, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_size_get (const Evas_Object *obj, const char *part, double *dw, double *dh);
-        [ :edje_object_part_drag_size_get, [ :evas_object_p, :string, :double_p, :double_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_step_set (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_step_set, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_step_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
-        [ :edje_object_part_drag_step_get, [ :evas_object_p, :string, :double_p, :double_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_page_set (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_page_set, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_page_get (const Evas_Object *obj, const char *part, double *dx, double *dy);
-        [ :edje_object_part_drag_page_get, [ :evas_object_p, :string, :double_p, :double_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_step (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_step, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_drag_page (Evas_Object *obj, const char *part, double dx, double dy);
-        [ :edje_object_part_drag_page, [ :evas_object_p, :string, :double, :double ], :eina_bool ],
-        # EAPI Evas_Object *edje_object_part_external_object_get (const Evas_Object *obj, const char *part);
-        [ :edje_object_part_external_object_get, [ :evas_object_p, :string ], :evas_object_p ],
-        # EAPI Eina_Bool edje_object_part_external_param_set (Evas_Object *obj, const char *part, const Edje_External_Param *param);
-        [ :edje_object_part_external_param_set, [ :evas_object_p, :string, :edje_external_param_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_external_param_get (const Evas_Object *obj, const char *part, Edje_External_Param *param);
-        [ :edje_object_part_external_param_get, [ :evas_object_p, :string, :edje_external_param_p ], :eina_bool ],
-        # EAPI Evas_Object *edje_object_part_external_content_get (const Evas_Object *obj, const char *part, const char *content);
-        [ :edje_object_part_external_content_get, [ :evas_object_p, :string, :string ], :evas_object_p ],
-        # EAPI Edje_External_Param_Type edje_object_part_external_param_type_get (const Evas_Object *obj, const char *part, const char *param);
-        [ :edje_object_part_external_param_type_get, [ :evas_object_p, :string, :string ], :edje_external_param_type ],
-        # EAPI Eina_Bool edje_object_part_box_append (Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :edje_object_part_box_append, [ :evas_object_p, :string, :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_box_prepend (Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :edje_object_part_box_prepend, [ :evas_object_p, :string, :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_box_insert_before (Evas_Object *obj, const char *part, Evas_Object *child, const Evas_Object *reference);
-        [ :edje_object_part_box_insert_before, [ :evas_object_p, :string, :evas_object_p, :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_box_insert_at (Evas_Object *obj, const char *part, Evas_Object *child, unsigned int pos);
-        [ :edje_object_part_box_insert_at, [ :evas_object_p, :string, :evas_object_p, :uint ], :eina_bool ],
-        # EAPI Evas_Object *edje_object_part_box_remove (Evas_Object *obj, const char *part, Evas_Object *child);
-        [ :edje_object_part_box_remove, [ :evas_object_p, :string, :evas_object_p ], :evas_object_p ],
-        # EAPI Evas_Object *edje_object_part_box_remove_at (Evas_Object *obj, const char *part, unsigned int pos);
-        [ :edje_object_part_box_remove_at, [ :evas_object_p, :string, :uint ], :evas_object_p ],
-        # EAPI Eina_Bool edje_object_part_box_remove_all (Evas_Object *obj, const char *part, Eina_Bool clear);
-        [ :edje_object_part_box_remove_all, [ :evas_object_p, :string, :eina_bool ], :eina_bool ],
-        # EAPI Evas_Object *edje_object_part_table_child_get (Evas_Object *obj, const char *part, unsigned int col, unsigned int row);
-        [ :edje_object_part_table_child_get, [ :evas_object_p, :string, :uint, :uint ], :evas_object_p ],
-        # EAPI Eina_Bool edje_object_part_table_pack (Evas_Object *obj, const char *part, Evas_Object *child_obj, unsigned short col, unsigned short row, unsigned short colspan, unsigned short rowspan);
-        [ :edje_object_part_table_pack, [ :evas_object_p, :string, :evas_object_p, :ushort, :ushort, :ushort, :ushort ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_table_unpack (Evas_Object *obj, const char *part, Evas_Object *child_obj);
-        [ :edje_object_part_table_unpack, [ :evas_object_p, :string, :evas_object_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_table_col_row_size_get (const Evas_Object *obj, const char *part, int *cols, int *rows);
-        [ :edje_object_part_table_col_row_size_get, [ :evas_object_p, :string, :int_p, :int_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_object_part_table_clear (Evas_Object *obj, const char *part, Eina_Bool clear);
-        [ :edje_object_part_table_clear, [ :evas_object_p, :string, :eina_bool ], :eina_bool ],
-        # EAPI void edje_object_message_send (Evas_Object *obj, Edje_Message_Type type, int id, void *msg);
-        [ :edje_object_message_send, [ :evas_object_p, :edje_message_type, :int, :void_p ], :void ],
-        # EAPI void edje_object_message_handler_set (Evas_Object *obj, Edje_Message_Handler_Cb func, void *data);
-        [ :edje_object_message_handler_set, [ :evas_object_p, :edje_message_handler_cb, :void_p ], :void ],
-        # EAPI void edje_object_message_signal_process (Evas_Object *obj);
-        [ :edje_object_message_signal_process, [ :evas_object_p ], :void ],
-        # EAPI void edje_message_signal_process (void);
-        [ :edje_message_signal_process, [  ], :void ],
-        # EAPI Eina_Bool edje_external_type_register (const char *type_name, const Edje_External_Type *type_info);
-        [ :edje_external_type_register, [ :string, :edje_external_type_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_external_type_unregister (const char *type_name);
-        [ :edje_external_type_unregister, [ :string ], :eina_bool ],
-        # EAPI void edje_external_type_array_register (const Edje_External_Type_Info *array);
-        [ :edje_external_type_array_register, [ :edje_external_type_info_p ], :void ],
-        # EAPI void edje_external_type_array_unregister (const Edje_External_Type_Info *array);
-        [ :edje_external_type_array_unregister, [ :edje_external_type_info_p ], :void ],
-        # EAPI unsigned int edje_external_type_abi_version_get (void) EINA_CONST;
-        [ :edje_external_type_abi_version_get, [  ], :uint ],
-        # EAPI Eina_Iterator *edje_external_iterator_get (void);
-        [ :edje_external_iterator_get, [  ], :eina_iterator_p ],
-        # EAPI Edje_External_Param *edje_external_param_find (const Eina_List *params, const char *key);
-        [ :edje_external_param_find, [ :eina_list_p, :string ], :edje_external_param_p ],
-        # EAPI Eina_Bool edje_external_param_int_get (const Eina_List *params, const char *key, int *ret);
-        [ :edje_external_param_int_get, [ :eina_list_p, :string, :int_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_external_param_double_get (const Eina_List *params, const char *key, double *ret);
-        [ :edje_external_param_double_get, [ :eina_list_p, :string, :double_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_external_param_string_get (const Eina_List *params, const char *key, const char **ret);
-        [ :edje_external_param_string_get, [ :eina_list_p, :string, :string_array ], :eina_bool ],
-        # EAPI Eina_Bool edje_external_param_bool_get (const Eina_List *params, const char *key, Eina_Bool *ret);
-        [ :edje_external_param_bool_get, [ :eina_list_p, :string, :eina_bool_p ], :eina_bool ],
-        # EAPI Eina_Bool edje_external_param_choice_get (const Eina_List *params, const char *key, const char **ret);
-        [ :edje_external_param_choice_get, [ :eina_list_p, :string, :string_array ], :eina_bool ],
-        # EAPI const Edje_External_Param_Info *edje_external_param_info_get (const char *type_name);
-        [ :edje_external_param_info_get, [ :string ], :edje_external_param_info_p ],
-        # EAPI const Edje_External_Type *edje_external_type_get (const char *type_name);
-        [ :edje_external_type_get, [ :string ], :edje_external_type_p ],
-        # EAPI Eina_Bool edje_module_load (const char *module);
-        [ :edje_module_load, [ :string ], :eina_bool ],
-        # EAPI const Eina_List *edje_available_modules_get (void);
-        [ :edje_available_modules_get, [  ], :eina_list_p ],
-        # EAPI Edje_Perspective *edje_perspective_new (Evas *e);
-        [ :edje_perspective_new, [ :evas_p ], :edje_perspective_p ],
-        # EAPI void edje_perspective_free (Edje_Perspective *ps);
-        [ :edje_perspective_free, [ :edje_perspective_p ], :void ],
-        # EAPI void edje_perspective_set (Edje_Perspective *ps, Evas_Coord px, Evas_Coord py, Evas_Coord z0, Evas_Coord foc);
-        [ :edje_perspective_set, [ :edje_perspective_p, :int, :int, :int, :int ], :void ],
-        # EAPI void edje_perspective_global_set (Edje_Perspective *ps, Eina_Bool global);
-        [ :edje_perspective_global_set, [ :edje_perspective_p, :eina_bool ], :void ],
-        # EAPI Eina_Bool edje_perspective_global_get (const Edje_Perspective *ps);
-        [ :edje_perspective_global_get, [ :edje_perspective_p ], :eina_bool ],
-        # EAPI const Edje_Perspective *edje_evas_global_perspective_get(const Evas *e);
-        [ :edje_evas_global_perspective_get, [ :evas_p ], :edje_perspective_p ],
-        # EAPI void edje_object_perspective_set (Evas_Object *obj, Edje_Perspective *ps);
-        [ :edje_object_perspective_set, [ :evas_object_p, :edje_perspective_p ], :void ],
-        # EAPI const Edje_Perspective *edje_object_perspective_get (const Evas_Object *obj);
-        [ :edje_object_perspective_get, [ :evas_object_p ], :edje_perspective_p ],
-        ]
-        #
-        attach_fcts fcts
-    end
-end
-#
-# EOF
diff --git a/lib/efl/eet.rb b/lib/efl/eet.rb
index c9f0804..4623d24 100644
--- a/lib/efl/eet.rb
+++ b/lib/efl/eet.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/eet/eet-ffi'
+require 'efl/ffi/eet'
 #
 module Efl
     module Eet
diff --git a/lib/efl/elementary.rb b/lib/efl/elementary.rb
index cf06717..d142367 100644
--- a/lib/efl/elementary.rb
+++ b/lib/efl/elementary.rb
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 #
 require 'efl/evas'
-require 'efl/elementary/elementary-ffi'
+require 'efl/ffi/elementary'
 #
 module Efl
     module Elm
diff --git a/lib/efl/evas.rb b/lib/efl/evas.rb
index 9f3af38..259a1c9 100644
--- a/lib/efl/evas.rb
+++ b/lib/efl/evas.rb
@@ -1,7 +1,7 @@
 #! /usr/bin/env ruby
 # -*- coding: UTF-8 -*-
 #
-require 'efl/evas/evas-ffi'
+require 'efl/ffi/evas'
 #
 module Efl
     module API
diff --git a/lib/efl/ffi.rb b/lib/efl/ffi.rb
index 4419b38..f583f2d 100644
--- a/lib/efl/ffi.rb
+++ b/lib/efl/ffi.rb
@@ -72,6 +72,6 @@ module Efl
     end
 end
 #
-require 'efl/eina/eina_types-ffi'
+require 'efl/ffi/eina_types'
 #
 # EOF
diff --git a/lib/efl/ecore/ecore-ffi.rb b/lib/efl/ffi/ecore.rb
index 394af34..394af34 100644
--- a/lib/efl/ecore/ecore-ffi.rb
+++ b/lib/efl/ffi/ecore.rb
diff --git a/lib/efl/ecore/ecore_evas-ffi.rb b/lib/efl/ffi/ecore_evas.rb
index 948cae7..948cae7 100644
--- a/lib/efl/ecore/ecore_evas-ffi.rb
+++ b/lib/efl/ffi/ecore_evas.rb
diff --git a/lib/efl/ecore/ecore_getopt-ffi.rb b/lib/efl/ffi/ecore_getopt.rb
index c66312d..c66312d 100644
--- a/lib/efl/ecore/ecore_getopt-ffi.rb
+++ b/lib/efl/ffi/ecore_getopt.rb
diff --git a/lib/efl/ecore/ecore_input-ffi.rb b/lib/efl/ffi/ecore_input.rb
index a98e927..a98e927 100644
--- a/lib/efl/ecore/ecore_input-ffi.rb
+++ b/lib/efl/ffi/ecore_input.rb
diff --git a/lib/efl/eet/eet-ffi.rb b/lib/efl/ffi/eet.rb
index 37602c9..37602c9 100644
--- a/lib/efl/eet/eet-ffi.rb
+++ b/lib/efl/ffi/eet.rb
diff --git a/lib/efl/eina/eina_types-ffi.rb b/lib/efl/ffi/eina_types.rb
index 2601ee3..2601ee3 100644
--- a/lib/efl/eina/eina_types-ffi.rb
+++ b/lib/efl/ffi/eina_types.rb
diff --git a/lib/efl/elementary/elementary-ffi.rb b/lib/efl/ffi/elementary.rb
index 5d37153..5d37153 100644
--- a/lib/efl/elementary/elementary-ffi.rb
+++ b/lib/efl/ffi/elementary.rb
diff --git a/lib/efl/evas/evas-ffi.rb b/lib/efl/ffi/evas.rb
index 689daf2..689daf2 100644
--- a/lib/efl/evas/evas-ffi.rb
+++ b/lib/efl/ffi/evas.rb
diff --git a/tools/genruby.rb b/tools/genruby.rb
index 6acf55b..e327265 100755
--- a/tools/genruby.rb
+++ b/tools/genruby.rb
@@ -2,7 +2,7 @@
 # -*- coding: UTF-8 -*-
 #
 path = File.dirname __FILE__
-lib_path = File.join path, '..', 'lib', 'efl'
+lib_path = File.join path, '..', 'lib', 'efl', 'ffi'
 #
 # header, module name, lfct prefix, lib
 libraries = [
@@ -10,7 +10,7 @@ libraries = [
     [ 'Eet.h', 'Eet', 'eet', 'eet'],
     [ 'Evas.h', 'Evas', 'evas', 'evas'],
 #    [ 'Evas_GL.h', 'EvasGl', 'evas_gl', 'evas'],
-#    [ 'Edje.h', 'Edje', 'edje', 'edje'],
+    [ 'Edje.h', 'Edje', 'edje', 'edje'],
     [ 'Ecore.h', 'Ecore', 'ecore', 'ecore'],
 #    [ 'Ecore_Con.h', 'EcoreCon', 'ecore_con', 'ecore'],
     [ 'Ecore_Input.h', 'EcoreInput', 'ecore', 'ecore'],
@@ -237,11 +237,11 @@ def gen_functions path, indent
     r
 end
 #
+Dir.mkdir lib_path unless Dir.exists? lib_path
+#
 libraries.collect do |header,module_name,module_base,lib|
     base = File.join path, 'api', header
-    dir = File.join lib_path, header[0..-3].split('_').first.downcase
-    Dir.mkdir dir unless Dir.exists? dir
-    output = File.join dir, "#{header[0..-3].downcase}-ffi.rb"
+    output = File.join lib_path, "#{header[0..-3].downcase}.rb"
     puts "parse #{base}-*"
     r = [lib, output, module_name, module_base ]
     r << gen_enums(base, INDENT)