diff --git a/src/bin/main.c b/src/bin/main.c
index 13744dd..0a1de30 100644
--- a/src/bin/main.c
+++ b/src/bin/main.c
@@ -876,14 +876,14 @@ template_show(app_data *ad)
 static Eina_Bool
 init(app_data *ad, int argc, char **argv)
 {
-   enventor_init(argc, argv);
-
    ecore_event_handler_add(ECORE_EVENT_KEY_DOWN, main_key_down_cb, ad);
    ecore_event_handler_add(ECORE_EVENT_KEY_UP, main_key_up_cb, ad);
    ecore_event_handler_add(ECORE_EVENT_MOUSE_WHEEL, main_mouse_wheel_cb, ad);
 
    elm_setup();
 
+   enventor_init(argc, argv);
+
    Eina_Bool default_edc = config_data_set(ad, argc, argv);
    newfile_default_set(default_edc);
    base_gui_init();
diff --git a/src/lib/enventor_main.c b/src/lib/enventor_main.c
index 74e0cac..4012d83 100644
--- a/src/lib/enventor_main.c
+++ b/src/lib/enventor_main.c
@@ -96,12 +96,6 @@ enventor_init(int argc, char **argv)
         _enventor_log_dom = EINA_LOG_DOMAIN_GLOBAL;
      }
 
-   //FIXME: These should be moved to bin side.
-   elm_app_compile_bin_dir_set(PACKAGE_BIN_DIR);
-   elm_app_compile_data_dir_set(PACKAGE_DATA_DIR);
-   elm_app_compile_lib_dir_set(PACKAGE_LIB_DIR);
-   elm_app_info_set(enventor_init, "enventor", "images/logo.png");
-
    snprintf(EDJE_PATH, sizeof(EDJE_PATH), "%s/themes/enventor.edj",
             elm_app_data_dir_get());