diff --git a/evoque/api/app.py b/evoque/api/app.py
index 8095414..004a490 100644
--- a/evoque/api/app.py
+++ b/evoque/api/app.py
@@ -16,8 +16,8 @@ import webob.exc
 from werkzeug import serving
 
 from evoque.api import hooks
+from evoque.common import service
 from evoque import exceptions
-from evoque import service
 
 LOG = log.getLogger(__name__)
 
diff --git a/evoque/api/app.wsgi b/evoque/api/app.wsgi
deleted file mode 100644
index b612bce..0000000
--- a/evoque/api/app.wsgi
+++ /dev/null
@@ -1,31 +0,0 @@
-#
-# Copyright 2014 eNovance
-#
-# Authors: Mehdi Abaakouk <mehdi.abaakouk@enovance.com>
-#
-# Licensed under the Apache License, Version 2.0 (the "License"); you may
-# not use this file except in compliance with the License. You may obtain
-# a copy of the License at
-#
-#      http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
-# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
-# License for the specific language governing permissions and limitations
-# under the License.
-
-"""Use this file for deploying the API under mod_wsgi.
-
-See http://pecan.readthedocs.org/en/latest/deployment.html for details.
-"""
-from oslo_config import cfg
-
-from evoque import service
-from evoque.api import app
-
-# Initialize the oslo configuration library and logging
-conf = service.prepare_service()
-# The pecan debugger cannot be used in wsgi mode
-conf.set_default('pecan_debug', False, group='api')
-application = app.setup_app(cfg=conf)
diff --git a/evoque/cmd/engine.py b/evoque/cmd/engine.py
index 64492c8..69ad69b 100644
--- a/evoque/cmd/engine.py
+++ b/evoque/cmd/engine.py
@@ -21,8 +21,8 @@ from oslo_service import service
 
 from evoque.common.i18n import _LI
 from evoque.common import rpc_service
+from evoque.common import service as evoque_service
 from evoque.engine.ticket import endpoint as ticket_endpoint
-from evoque import service as evoque_service
 
 LOG = logging.getLogger(__name__)
 
diff --git a/evoque/common/rpc_service.py b/evoque/common/rpc_service.py
index 811253e..bfce81f 100644
--- a/evoque/common/rpc_service.py
+++ b/evoque/common/rpc_service.py
@@ -12,7 +12,7 @@
 #    See the License for the specific language governing permissions and
 #    limitations under the License.
 
-"""Common RPC service and API tools for Magnum."""
+"""Common RPC service and API tools for Evoque."""
 
 import eventlet
 from oslo_config import cfg
diff --git a/evoque/service.py b/evoque/common/service.py
similarity index 96%
rename from evoque/service.py
rename to evoque/common/service.py
index 5d7e705..62845cb 100644
--- a/evoque/service.py
+++ b/evoque/common/service.py
@@ -18,8 +18,6 @@ from oslo_log import log as logging
 
 from evoque import opts
 
-LOG = logging.getLogger(__name__)
-
 
 def prepare_service():