--- a/cmd.c	Tue May 03 02:30:09 2011 +0300
+++ b/cmd.c	Tue May 03 14:07:05 2011 +0300
@@ -34,20 +34,21 @@
 #include <mcabber/roster.h>
 #include <mcabber/modules.h>
 #include <mcabber/hooks.h>
+#include <mcabber/api.h>
 
 #include "config.h"
 
-static void mcmd_init   (void);
-static void mcmd_uninit (void);
+void mcmd_init   (void);
+void mcmd_uninit (void);
 
 #define DESCRIPTION ( \
 	"Sends output of command to buddy\n" \
 	"Recognizes options cmd_shell, cmd_redirect_stderr, cmd_header and cmd_header_inline\n" \
 	"Provides command /cmd" )
 
-static module_info_t info_cmd_experimental = {
-	.branch          = "experimental",
-	.api             = 27,
+static module_info_t info_cmd_dev = {
+	.branch          = "dev",
+	.api             = 20,
 	.version         = PROJECT_VERSION,
 	.description     = DESCRIPTION,
 	.requires        = NULL,
@@ -56,19 +57,8 @@
 	.next            = NULL,
 };
 
-static module_info_t info_cmd_dev = {
-	.branch          = "dev",
-	.api             = 13,
-	.version         = PROJECT_VERSION,
-	.description     = DESCRIPTION,
-	.requires        = NULL,
-	.init            = mcmd_init,
-	.uninit          = mcmd_uninit,
-	.next            = &info_cmd_experimental,
-};
-
 module_info_t info_cmd = {
-	.branch          = "0.10.0",
+	.branch          = "0.10.1",
 	.api             = 1,
 	.version         = PROJECT_VERSION,
 	.description     = DESCRIPTION,
@@ -87,7 +77,7 @@
 	GIOChannel *channel;
 } cmd_cb_t;
 
-#ifdef HAVE_CMD_ID
+#ifdef MCABBER_API_HAVE_CMD_ID
 static gpointer mcmd_cmid = NULL;
 #endif
 
@@ -347,20 +337,20 @@
 	}
 }
 
-static void mcmd_init (void)
+void mcmd_init (void)
 {
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_add ("cmd", "", 0, 0, do_cmd, NULL);
 #else
 	mcmd_cmid = cmd_add ("cmd", "", 0, 0, do_cmd, NULL);
 #endif
 }
 
-static void mcmd_uninit (void)
+void mcmd_uninit (void)
 {
 	GSList *sel;
 
-#ifndef HAVE_CMD_ID
+#ifndef MCABBER_API_HAVE_CMD_ID
 	cmd_del ("cmd");
 #else
 	if (mcmd_cmid)