diff --git a/ceilometer/cli.py b/ceilometer/cmd/sample.py
similarity index 91%
rename from ceilometer/cli.py
rename to ceilometer/cmd/sample.py
index 7d6439b4..c08212e6 100644
--- a/ceilometer/cli.py
+++ b/ceilometer/cmd/sample.py
@@ -20,12 +20,6 @@
 import logging
 import sys
 
-import eventlet
-# NOTE(jd) We need to monkey patch the socket and select module for,
-# at least, oslo.messaging, otherwise everything's blocked on its
-# first read() or select(), thread need to be patched too, because
-# oslo.messaging use threading.local
-eventlet.monkey_patch(socket=True, select=True, thread=True)
 from oslo_config import cfg
 from oslo_context import context
 from oslo_utils import timeutils
diff --git a/setup.cfg b/setup.cfg
index ff2f19c7..0a717b40 100644
--- a/setup.cfg
+++ b/setup.cfg
@@ -331,7 +331,7 @@ console_scripts =
     ceilometer-polling = ceilometer.cmd.polling:main
     ceilometer-agent-notification = ceilometer.cmd.agent_notification:main
     ceilometer-agent-ipmi = ceilometer.cmd.polling:main_ipmi
-    ceilometer-send-sample = ceilometer.cli:send_sample
+    ceilometer-send-sample = ceilometer.cmd.sample:send_sample
     ceilometer-dbsync = ceilometer.cmd.storage:dbsync
     ceilometer-expirer = ceilometer.cmd.storage:expirer
     ceilometer-rootwrap = oslo_rootwrap.cmd:main