diff --git a/configure.ac b/configure.ac
index 84b9e4b..e1cae45 100644
--- a/configure.ac
+++ b/configure.ac
@@ -230,8 +230,8 @@ AC_CONFIG_FILES([
     po/Makefile.in
     docs/Makefile
     docs/reference/Makefile
-    docs/reference/libfm/Makefile
-    docs/reference/libfm/version.xml
+    docs/reference/libsmfm-gtk/Makefile
+    docs/reference/libsmfm-gtk/version.xml
     libsmfm-gtk2.pc
     libsmfm-gtk3.pc
 ])
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index f8fad48..be313fc 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -1,3 +1,3 @@
 include $(top_srcdir)/Makefile.decl
 
-SUBDIRS = libfm
+SUBDIRS = libsmfm-gtk
diff --git a/docs/reference/libfm/Makefile.am b/docs/reference/libsmfm-gtk/Makefile.am
similarity index 90%
rename from docs/reference/libfm/Makefile.am
rename to docs/reference/libsmfm-gtk/Makefile.am
index 8537cec..61358f3 100644
--- a/docs/reference/libfm/Makefile.am
+++ b/docs/reference/libsmfm-gtk/Makefile.am
@@ -11,14 +11,14 @@ AUTOMAKE_OPTIONS = 1.6
 # of using the various options.
 
 # The name of the module, e.g. 'glib'.
-DOC_MODULE=libfm
+DOC_MODULE=libsmfm-gtk@GTK_VERSION_MAJOR@
 
 # Uncomment for versioned docs and specify the version of the module, e.g. '2'.
 #DOC_MODULE_VERSION=2
 
 
 # The top-level SGML file. You can change this if you want to.
-DOC_MAIN_SGML_FILE=$(DOC_MODULE)-docs.xml
+DOC_MAIN_SGML_FILE=libsmfm-gtk-docs.xml
 
 # The directory containing the source code. Relative to $(srcdir).
 # gtk-doc will search all .c & .h files beneath here for inline comments
@@ -55,14 +55,10 @@ FIXXREF_OPTIONS=
 # e.g. CFILE_GLOB=$(top_srcdir)/gtk/*.c
 HFILE_GLOB= \
 	$(top_srcdir)/src/*.h \
-	$(top_srcdir)/src/base/*.h \
-	$(top_srcdir)/src/job/*.h \
 	$(top_srcdir)/src/gtk/*.h \
 	$(NULL)
 
 CFILE_GLOB=$(top_srcdir)/src/*.c \
-	$(top_srcdir)/src/base/*.c \
-	$(top_srcdir)/src/job/*.c \
 	$(top_srcdir)/src/gtk/*.c \
 	$(NULL)
 
@@ -73,18 +69,9 @@ EXTRA_HFILES=
 # Header files to ignore when scanning. Use base file name, no paths
 # e.g. IGNORE_HFILES=gtkdebug.h gtkintl.h
 IGNORE_HFILES= \
-	fm-marshal.h \
 	fm-gtk-marshal.h \
 	main-win.h \
 	dbus-utils.h \
-	fm-udisks.h \
-	g-udisks-device.h \
-	g-udisks-drive.h \
-	g-udisks-mount.h \
-	g-udisks-volume.h \
-	g-udisks-volume-monitor.h \
-	udisks-device.h \
-	udisks.h \
 	fm-app-lookup.h \
 	exo-icon-view.h \
 	exo-marshal.h \
@@ -119,8 +106,8 @@ GTKDOC_CFLAGS= \
 	-I$(top_builddir) \
 	$(GTK_CFLAGS)
 GTKDOC_LIBS= \
-	$(top_builddir)/src/libfm.la \
-	$(top_builddir)/src/$(LIBFM_GTK_LTLIBRARIES) \
+	$(top_srcdir)/src/libsmfm-gtk@GTK_VERSION_MAJOR@.la \
+	$(top_srcdir)/src/$(LIBSMFM_GTK_LTLIBRARIES) \
 	$(GTK_LIBS) \
 	$(NULL)
 
diff --git a/docs/reference/libfm/libfm-docs.xml b/docs/reference/libsmfm-gtk/libsmfm-gtk-docs.xml
similarity index 67%
rename from docs/reference/libfm/libfm-docs.xml
rename to docs/reference/libsmfm-gtk/libsmfm-gtk-docs.xml
index 9d9c7b5..3516d56 100644
--- a/docs/reference/libfm/libfm-docs.xml
+++ b/docs/reference/libsmfm-gtk/libsmfm-gtk-docs.xml
@@ -24,39 +24,6 @@ missing in gtk+/glib. It's originally developed for use in PCManFM, but
 it's carefully designed to be desktop environment-independent and can be
 used to develop other file manager-related tools as well.
     </para>
-    <chapter id="libfm-core">
-      <title>Libfm Core Reference.</title>
-      <xi:include href="xml/fm.xml"/>
-      <xi:include href="xml/fm-app-info.xml"/>
-      <xi:include href="xml/fm-archiver.xml"/>
-      <xi:include href="xml/fm-bookmarks.xml"/>
-      <xi:include href="xml/fm-config.xml"/>
-      <xi:include href="xml/fm-dummy-monitor.xml"/>
-      <xi:include href="xml/fm-file.xml"/>
-      <xi:include href="xml/fm-file-info.xml"/>
-      <xi:include href="xml/fm-file-launcher.xml"/>
-      <xi:include href="xml/fm-folder.xml"/>
-      <xi:include href="xml/fm-icon.xml"/>
-      <xi:include href="xml/fm-list.xml"/>
-      <xi:include href="xml/fm-mime-type.xml"/>
-      <xi:include href="xml/fm-monitor.xml"/>
-      <xi:include href="xml/fm-nav-history.xml"/>
-      <xi:include href="xml/fm-path.xml"/>
-      <xi:include href="xml/fm-templates.xml"/>
-      <xi:include href="xml/fm-terminal.xml"/>
-      <xi:include href="xml/fm-thumbnail-loader.xml"/>
-      <xi:include href="xml/fm-thumbnailer.xml"/>
-      <xi:include href="xml/fm-utils.xml"/>
-    </chapter>
-    <chapter id="libfm-jobs">
-      <title>Libfm Jobs.</title>
-      <xi:include href="xml/fm-deep-count-job.xml"/>
-      <xi:include href="xml/fm-dir-list-job.xml"/>
-      <xi:include href="xml/fm-file-info-job.xml"/>
-      <xi:include href="xml/fm-file-ops-job.xml"/>
-      <xi:include href="xml/fm-job.xml"/>
-      <xi:include href="xml/fm-simple-job.xml"/>
-    </chapter>
     <chapter id="libfm-gtk">
       <title>Libfm Gtk+ Widgets and Objects.</title>
       <xi:include href="xml/fm-gtk.xml"/>
diff --git a/docs/reference/libfm/libfm-sections.txt b/docs/reference/libsmfm-gtk/libsmfm-gtk-sections.txt
similarity index 50%
rename from docs/reference/libfm/libfm-sections.txt
rename to docs/reference/libsmfm-gtk/libsmfm-gtk-sections.txt
index ed7b4d8..a403bb2 100644
--- a/docs/reference/libfm/libfm-sections.txt
+++ b/docs/reference/libsmfm-gtk/libsmfm-gtk-sections.txt
@@ -1,13 +1,3 @@
-<SECTION>
-<FILE>fm</FILE>
-FM_CHECK_VERSION
-FM_VERSION_MAJOR
-FM_VERSION_MICRO
-FM_VERSION_MINOR
-fm_finalize
-fm_init
-fm_qdata_id
-</SECTION>
 
 <SECTION>
 <FILE>fm-app-chooser-combo-box</FILE>
@@ -25,14 +15,6 @@ fm_app_chooser_dlg_new
 fm_choose_app_for_mime_type
 </SECTION>
 
-<SECTION>
-<FILE>fm-app-info</FILE>
-fm_app_info_create_from_commandline
-fm_app_info_launch
-fm_app_info_launch_default_for_uri
-fm_app_info_launch_uris
-</SECTION>
-
 <SECTION>
 <FILE>fm-app-menu-view</FILE>
 fm_app_menu_view_dup_selected_app
@@ -43,43 +25,6 @@ fm_app_menu_view_is_item_app
 fm_app_menu_view_new
 </SECTION>
 
-<SECTION>
-<FILE>fm-archiver</FILE>
-FmArchiver
-fm_archiver_create_archive
-fm_archiver_extract_archives
-fm_archiver_extract_archives_to
-fm_archiver_get_all
-fm_archiver_get_default
-fm_archiver_is_mime_type_supported
-fm_archiver_set_default
-</SECTION>
-
-<SECTION>
-<FILE>fm-bookmarks</FILE>
-<TITLE>FmBookmarks</TITLE>
-FM_BOOKMARKS_TYPE
-FmBookmarkItem
-FmBookmarks
-FmBookmarksClass
-fm_bookmark_item_ref
-fm_bookmark_item_unref
-fm_bookmarks_append
-fm_bookmarks_dup
-fm_bookmarks_get_all
-fm_bookmarks_insert
-fm_bookmarks_list_all
-fm_bookmarks_remove
-fm_bookmarks_rename
-fm_bookmarks_reorder
-<SUBSECTION Standard>
-FM_BOOKMARKS
-FM_BOOKMARKS_CLASS
-FM_IS_BOOKMARKS
-FM_IS_BOOKMARKS_CLASS
-fm_bookmarks_get_type
-</SECTION>
-
 <SECTION>
 <FILE>fm-cell-renderer-pixbuf</FILE>
 <TITLE>FmCellRendererPixbuf</TITLE>
@@ -120,90 +65,6 @@ fm_clipboard_have_files
 fm_clipboard_paste_files
 </SECTION>
 
-<SECTION>
-<FILE>fm-config</FILE>
-<TITLE>FmConfig</TITLE>
-FM_CONFIG_DEFAULT_AUTO_SELECTION_DELAY
-FM_CONFIG_DEFAULT_BACKUP_HIDDEN
-FM_CONFIG_DEFAULT_BIG_ICON_SIZE
-FM_CONFIG_DEFAULT_CONFIRM_DEL
-FM_CONFIG_DEFAULT_CONFIRM_TRASH
-FM_CONFIG_DEFAULT_FORCE_S_NOTIFY
-FM_CONFIG_DEFAULT_NO_EXPAND_EMPTY
-FM_CONFIG_DEFAULT_NO_USB_TRASH
-FM_CONFIG_DEFAULT_ONLY_USER_TEMPLATES
-FM_CONFIG_DEFAULT_PANE_ICON_SIZE
-FM_CONFIG_DEFAULT_PLACES_APPLICATIONS
-FM_CONFIG_DEFAULT_PLACES_COMPUTER
-FM_CONFIG_DEFAULT_PLACES_DESKTOP
-FM_CONFIG_DEFAULT_PLACES_HOME
-FM_CONFIG_DEFAULT_PLACES_NETWORK
-FM_CONFIG_DEFAULT_PLACES_ROOT
-FM_CONFIG_DEFAULT_PLACES_TRASH
-FM_CONFIG_DEFAULT_PLACES_UNMOUNTED
-FM_CONFIG_DEFAULT_SHOW_FULL_NAMES
-FM_CONFIG_DEFAULT_SHOW_THUMBNAIL
-FM_CONFIG_DEFAULT_SINGLE_CLICK
-FM_CONFIG_DEFAULT_SMALL_ICON_SIZE
-FM_CONFIG_DEFAULT_TEMPL_TYPE_ONCE
-FM_CONFIG_DEFAULT_TEMPLATE_RUN_APP
-FM_CONFIG_DEFAULT_THUMBNAIL_LOCAL
-FM_CONFIG_DEFAULT_THUMBNAIL_MAX
-FM_CONFIG_DEFAULT_THUMBNAIL_SIZE
-FM_CONFIG_DEFAULT_USE_TRASH
-FM_CONFIG_TYPE
-FmConfig
-FmConfigClass
-fm_config
-fm_config_emit_changed
-fm_config_load_from_file
-fm_config_load_from_key_file
-fm_config_new
-fm_config_save
-<SUBSECTION Standard>
-FM_CONFIG
-FM_CONFIG_CLASS
-FM_IS_CONFIG
-FM_IS_CONFIG_CLASS
-fm_config_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-deep-count-job</FILE>
-<TITLE>FmDeepCountJob</TITLE>
-FM_DEEP_COUNT_JOB_TYPE
-FmDeepCountJob
-FmDeepCountJobClass
-FmDeepCountJobFlags
-fm_deep_count_job_new
-fm_deep_count_job_set_dest
-<SUBSECTION Standard>
-FM_DEEP_COUNT_JOB
-FM_DEEP_COUNT_JOB_CLASS
-FM_IS_DEEP_COUNT_JOB
-FM_IS_DEEP_COUNT_JOB_CLASS
-fm_deep_count_job_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-dir-list-job</FILE>
-<TITLE>FmDirListJob</TITLE>
-FmDirListJob
-FmDirListJobClass
-fm_dir_list_job_add_found_file
-fm_dir_list_job_get_files
-fm_dir_list_job_new
-fm_dir_list_job_new_for_gfile
-fm_dir_list_job_set_incremental
-<SUBSECTION Standard>
-FM_DIR_LIST_JOB
-FM_DIR_LIST_JOB_CLASS
-FM_IS_DIR_LIST_JOB
-FM_IS_DIR_LIST_JOB_CLASS
-FM_TYPE_DIR_LIST_JOB
-fm_dir_list_job_get_type
-</SECTION>
-
 <SECTION>
 <FILE>fm-dir-tree-model</FILE>
 <TITLE>FmDirTreeModel</TITLE>
@@ -307,121 +168,6 @@ FM_TYPE_DND_SRC
 fm_dnd_src_get_type
 </SECTION>
 
-<SECTION>
-<FILE>fm-dummy-monitor</FILE>
-<TITLE>FmDummyMonitor</TITLE>
-FmDummyMonitor
-FmDummyMonitorClass
-fm_dummy_monitor_new
-<SUBSECTION Standard>
-FM_DUMMY_MONITOR
-FM_DUMMY_MONITOR_CLASS
-FM_IS_DUMMY_MONITOR
-FM_IS_DUMMY_MONITOR_CLASS
-FM_TYPE_DUMMY_MONITOR
-fm_dummy_monitor_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-file</FILE>
-<TITLE>FmFile</TITLE>
-FmFile
-FmFileInitTable
-FmFileInterface
-fm_file_add_vfs
-fm_file_new_for_commandline_arg
-fm_file_new_for_uri
-fm_file_wants_incremental
-<SUBSECTION Standard>
-FM_FILE
-FM_FILE_GET_IFACE
-FM_IS_FILE
-FM_TYPE_FILE
-fm_file_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-file-info</FILE>
-FM_FILE_INFO
-FmFileInfo
-fm_file_info_can_thumbnail
-fm_file_info_get_atime
-fm_file_info_get_blocks
-fm_file_info_get_collate_key
-fm_file_info_get_collate_key_nocasefold
-fm_file_info_get_desc
-fm_file_info_get_dev
-fm_file_info_get_disp_mtime
-fm_file_info_get_disp_name
-fm_file_info_get_disp_size
-fm_file_info_get_fs_id
-fm_file_info_get_gid
-fm_file_info_get_icon
-fm_file_info_get_mime_type
-fm_file_info_get_mode
-fm_file_info_get_mtime
-fm_file_info_get_name
-fm_file_info_get_path
-fm_file_info_get_size
-fm_file_info_get_target
-fm_file_info_get_uid
-fm_file_info_is_accessible
-fm_file_info_is_desktop_entry
-fm_file_info_is_dir
-fm_file_info_is_executable_type
-fm_file_info_is_hidden
-fm_file_info_is_image
-fm_file_info_is_mountable
-fm_file_info_is_native
-fm_file_info_is_shortcut
-fm_file_info_is_symlink
-fm_file_info_is_text
-fm_file_info_is_unknown_type
-fm_file_info_list_is_same_fs
-fm_file_info_list_is_same_type
-fm_file_info_list_new
-fm_file_info_new
-fm_file_info_new_from_gfileinfo
-fm_file_info_new_from_menu_cache_item
-fm_file_info_ref
-fm_file_info_set_disp_name
-fm_file_info_set_from_gfileinfo
-fm_file_info_set_from_menu_cache_item
-fm_file_info_set_from_native_file
-fm_file_info_set_path
-fm_file_info_unref
-fm_file_info_update
-</SECTION>
-
-<SECTION>
-<FILE>fm-file-info-job</FILE>
-<TITLE>FmFileInfoJob</TITLE>
-FmFileInfoJob
-FmFileInfoJobClass
-FmFileInfoJobFlags
-fm_file_info_job_add
-fm_file_info_job_add_gfile
-fm_file_info_job_get_current
-fm_file_info_job_new
-<SUBSECTION Standard>
-FM_FILE_INFO_JOB
-FM_FILE_INFO_JOB_CLASS
-FM_IS_FILE_INFO_JOB
-FM_IS_FILE_INFO_JOB_CLASS
-FM_TYPE_FILE_INFO_JOB
-fm_file_info_job_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-file-launcher</FILE>
-FmFileLauncher
-FmFileLauncherExecAction
-FmLaunchFolderFunc
-fm_launch_desktop_entry
-fm_launch_files
-fm_launch_paths
-</SECTION>
-
 <SECTION>
 <FILE>fm-file-menu</FILE>
 FmFileMenu
@@ -436,31 +182,6 @@ fm_file_menu_new_for_files
 fm_file_menu_set_folder_func
 </SECTION>
 
-<SECTION>
-<FILE>fm-file-ops-job</FILE>
-<TITLE>FmFileOpsJob</TITLE>
-FM_FILE_OPS_JOB_TYPE
-FmFileOpOption
-FmFileOpType
-FmFileOpsJob
-FmFileOpsJobClass
-fm_file_ops_job_ask_rename
-fm_file_ops_job_emit_cur_file
-fm_file_ops_job_emit_percent
-fm_file_ops_job_emit_prepared
-fm_file_ops_job_get_dest
-fm_file_ops_job_new
-fm_file_ops_job_set_chmod
-fm_file_ops_job_set_chown
-fm_file_ops_job_set_dest
-fm_file_ops_job_set_recursive
-<SUBSECTION Standard>
-FM_FILE_OPS_JOB
-FM_FILE_OPS_JOB_CLASS
-FM_IS_FILE_OPS_JOB
-FM_IS_FILE_OPS_JOB_CLASS
-fm_file_ops_job_get_type
-</SECTION>
 
 <SECTION>
 <FILE>fm-file-ops-job-change-attr</FILE>
@@ -485,35 +206,6 @@ fm_file_properties_widget_new
 fm_show_file_properties
 </SECTION>
 
-<SECTION>
-<FILE>fm-folder</FILE>
-<TITLE>FmFolder</TITLE>
-FmFolder
-FmFolderClass
-fm_folder_from_gfile
-fm_folder_from_path
-fm_folder_from_path_name
-fm_folder_from_uri
-fm_folder_get_file_by_name
-fm_folder_get_files
-fm_folder_get_filesystem_info
-fm_folder_get_info
-fm_folder_get_path
-fm_folder_is_empty
-fm_folder_is_incremental
-fm_folder_is_loaded
-fm_folder_is_valid
-fm_folder_query_filesystem_info
-fm_folder_reload
-<SUBSECTION Standard>
-FM_FOLDER
-FM_FOLDER_CLASS
-FM_IS_FOLDER
-FM_IS_FOLDER_CLASS
-FM_TYPE_FOLDER
-fm_folder_get_type
-</SECTION>
-
 <SECTION>
 <FILE>fm-standard-view</FILE>
 <TITLE>FmStandardView</TITLE>
@@ -698,182 +390,11 @@ fm_widget_menu_fix_tooltips
 fm_yes_no
 </SECTION>
 
-<SECTION>
-<FILE>fm-icon</FILE>
-FmIcon
-fm_icon_from_gicon
-fm_icon_from_name
-fm_icon_get_user_data
-fm_icon_ref
-fm_icon_set_user_data
-fm_icon_set_user_data_destroy
-fm_icon_unload_cache
-fm_icon_unload_user_data_cache
-fm_icon_unref
-</SECTION>
-
 <SECTION>
 <FILE>fm-icon-pixbuf</FILE>
 fm_pixbuf_from_icon
 </SECTION>
 
-<SECTION>
-<FILE>fm-job</FILE>
-<TITLE>FmJob</TITLE>
-FmJob
-FmJobCallMainThreadFunc
-FmJobClass
-FmJobErrorAction
-FmJobErrorSeverity
-fm_job_ask
-fm_job_ask_valist
-fm_job_askv
-fm_job_call_main_thread
-fm_job_cancel
-fm_job_emit_error
-fm_job_finish
-fm_job_get_cancellable
-fm_job_init_cancellable
-fm_job_is_cancelled
-fm_job_is_running
-fm_job_run_async
-fm_job_run_sync
-fm_job_run_sync_with_mainloop
-fm_job_set_cancellable
-<SUBSECTION Standard>
-FM_IS_JOB
-FM_IS_JOB_CLASS
-FM_JOB
-FM_JOB_CLASS
-FM_TYPE_JOB
-fm_job_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-list</FILE>
-FM_LIST
-FmList
-FmListFuncs
-fm_list_clear
-fm_list_delete_link
-fm_list_new
-fm_list_ref
-fm_list_remove
-fm_list_remove_all
-fm_list_unref
-</SECTION>
-
-<SECTION>
-<FILE>fm-mime-type</FILE>
-FmMimeType
-fm_mime_type_add_thumbnailer
-fm_mime_type_from_file_name
-fm_mime_type_from_name
-fm_mime_type_from_native_file
-fm_mime_type_get_desc
-fm_mime_type_get_icon
-fm_mime_type_get_thumbnailers
-fm_mime_type_ref
-fm_mime_type_remove_thumbnailer
-fm_mime_type_unref
-<SUBSECTION Standard>
-fm_mime_type_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-monitor</FILE>
-fm_monitor_directory
-fm_monitor_lookup_dummy_monitor
-fm_monitor_lookup_monitor
-</SECTION>
-
-<SECTION>
-<FILE>fm-nav-history</FILE>
-<TITLE>FmNavHistory</TITLE>
-FM_NAV_HISTORY_TYPE
-FM_NAV_HISTORY_DEFAULT_SIZE
-FmNavHistory
-FmNavHistoryClass
-FmNavHistoryItem
-fm_nav_history_back
-fm_nav_history_can_back
-fm_nav_history_can_forward
-fm_nav_history_chdir
-fm_nav_history_clear
-fm_nav_history_forward
-fm_nav_history_get_cur
-fm_nav_history_get_cur_index
-fm_nav_history_get_cur_link
-fm_nav_history_get_nth_path
-fm_nav_history_get_scroll_pos
-fm_nav_history_go_to
-fm_nav_history_jump
-fm_nav_history_list
-fm_nav_history_new
-fm_nav_history_set_max
-<SUBSECTION Standard>
-FM_IS_NAV_HISTORY
-FM_IS_NAV_HISTORY_CLASS
-FM_NAV_HISTORY
-FM_NAV_HISTORY_CLASS
-fm_nav_history_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-path</FILE>
-FM_PATH
-FmFileInfoList
-FmPath
-FmPathFlags
-FmPathList
-fm_path_compare
-fm_path_depth
-fm_path_display_basename
-fm_path_display_name
-fm_path_equal
-fm_path_equal_str
-fm_path_get_apps_menu
-fm_path_get_basename
-fm_path_get_desktop
-fm_path_get_flags
-fm_path_get_home
-fm_path_get_parent
-fm_path_get_root
-fm_path_get_scheme_path
-fm_path_get_trash
-fm_path_has_prefix
-fm_path_hash
-fm_path_is_local
-fm_path_is_native
-fm_path_is_native_or_trash
-fm_path_is_trash
-fm_path_is_trash_root
-fm_path_is_virtual
-fm_path_is_xdg_menu
-fm_path_list_new
-fm_path_list_new_from_file_info_glist
-fm_path_list_new_from_file_info_gslist
-fm_path_list_new_from_file_info_list
-fm_path_list_new_from_uri_list
-fm_path_list_new_from_uris
-fm_path_list_to_uri_list
-fm_path_list_write_uri_list
-fm_path_new_child
-fm_path_new_child_len
-fm_path_new_for_commandline_arg
-fm_path_new_for_display_name
-fm_path_new_for_gfile
-fm_path_new_for_path
-fm_path_new_for_str
-fm_path_new_for_uri
-fm_path_new_relative
-fm_path_ref
-fm_path_to_gfile
-fm_path_to_str
-fm_path_to_uri
-fm_path_unref
-</SECTION>
-
 <SECTION>
 <FILE>fm-path-bar</FILE>
 <TITLE>FmPathBar</TITLE>
@@ -988,14 +509,6 @@ FM_TYPE_SIDE_PANE
 fm_side_pane_get_type
 </SECTION>
 
-<SECTION>
-<FILE>fm-simple-job</FILE>
-FmSimpleJobFunc
-fm_simple_job_new
-<SUBSECTION Standard>
-fm_simple_job_get_type
-</SECTION>
-
 <SECTION>
 <FILE>fm-sortable</FILE>
 <TITLE>FmSortMode</TITLE>
@@ -1021,36 +534,6 @@ FM_TYPE_TAB_LABEL
 fm_tab_label_get_type
 </SECTION>
 
-<SECTION>
-<FILE>fm-templates</FILE>
-FM_TEMPLATE_TYPE
-FmTemplate
-FmTemplateClass
-fm_template_create_file
-fm_template_get_icon
-fm_template_get_label
-fm_template_get_mime_type
-fm_template_get_name
-fm_template_get_prompt
-fm_template_is_directory
-fm_template_list_all
-<SUBSECTION Standard>
-FM_IS_TEMPLATE
-fm_template_get_type
-</SECTION>
-
-<SECTION>
-<FILE>fm-terminal</FILE>
-FM_TERMINAL_TYPE
-FmTerminal
-FmTerminalClass
-fm_terminal_dup_default
-fm_terminal_launch
-<SUBSECTION Standard>
-FM_IS_TERMINAL
-fm_terminal_get_type
-</SECTION>
-
 <SECTION>
 <FILE>fm-thumbnail</FILE>
 FmThumbnailReadyCallback
@@ -1062,42 +545,4 @@ fm_thumbnail_request_get_pixbuf
 fm_thumbnail_request_get_size
 </SECTION>
 
-<SECTION>
-<FILE>fm-thumbnail-loader</FILE>
-FmThumbnailLoader
-FmThumbnailLoaderBackend
-FmThumbnailLoaderCallback
-fm_thumbnail_loader_cancel
-fm_thumbnail_loader_get_data
-fm_thumbnail_loader_get_file_info
-fm_thumbnail_loader_get_size
-fm_thumbnail_loader_load
-fm_thumbnail_loader_set_backend
-</SECTION>
-
-<SECTION>
-<FILE>fm-thumbnailer</FILE>
-FM_THUMBNAILER
-FmThumbnailer
-fm_thumbnailer_check_update
-fm_thumbnailer_command_for_uri
-fm_thumbnailer_free
-fm_thumbnailer_launch_for_uri
-fm_thumbnailer_launch_for_uri_async
-fm_thumbnailer_new_from_keyfile
-</SECTION>
-
-<SECTION>
-<FILE>fm-utils</FILE>
-FmAppCommandParseCallback
-FmAppCommandParseOption
-fm_app_command_parse
-fm_canonicalize_filename
-fm_file_size_to_str
-fm_get_home_dir
-fm_key_file_get_bool
-fm_key_file_get_int
-fm_run_in_default_main_context
-fm_strdup_replace
-</SECTION>
 
diff --git a/docs/reference/libsmfm-gtk/libsmfm-gtk2-sections.txt b/docs/reference/libsmfm-gtk/libsmfm-gtk2-sections.txt
new file mode 120000
index 0000000..f37b7de
--- /dev/null
+++ b/docs/reference/libsmfm-gtk/libsmfm-gtk2-sections.txt
@@ -0,0 +1 @@
+libsmfm-gtk-sections.txt
\ No newline at end of file
diff --git a/docs/reference/libsmfm-gtk/libsmfm-gtk3-sections.txt b/docs/reference/libsmfm-gtk/libsmfm-gtk3-sections.txt
new file mode 120000
index 0000000..f37b7de
--- /dev/null
+++ b/docs/reference/libsmfm-gtk/libsmfm-gtk3-sections.txt
@@ -0,0 +1 @@
+libsmfm-gtk-sections.txt
\ No newline at end of file
diff --git a/docs/reference/libfm/version.xml.in b/docs/reference/libsmfm-gtk/version.xml.in
similarity index 100%
rename from docs/reference/libfm/version.xml.in
rename to docs/reference/libsmfm-gtk/version.xml.in