diff --git a/nova-api-proxy/centos/build_srpm.data b/nova-api-proxy/centos/build_srpm.data
index cc205ad3..fbe0952a 100644
--- a/nova-api-proxy/centos/build_srpm.data
+++ b/nova-api-proxy/centos/build_srpm.data
@@ -1,2 +1,2 @@
-SRC_DIR="$PKG_BASE/nova_api_proxy"
+SRC_DIR="$PKG_BASE/nova-api-proxy"
 TIS_PATCH_VER=10
diff --git a/nova-api-proxy/centos/nova-api-proxy.spec b/nova-api-proxy/centos/nova-api-proxy.spec
index aaea3696..aada7763 100644
--- a/nova-api-proxy/centos/nova-api-proxy.spec
+++ b/nova-api-proxy/centos/nova-api-proxy.spec
@@ -40,13 +40,13 @@ Nova Computer API Proxy
                              --single-version-externally-managed
 
 install -d -m 755 %{buildroot}%{local_etc_systemd}
-install -p -D -m 644 scripts/api-proxy.service %{buildroot}%{local_etc_systemd}/api-proxy.service
+install -p -D -m 644 nova_api_proxy/scripts/api-proxy.service %{buildroot}%{local_etc_systemd}/api-proxy.service
 install -d -m 755 %{buildroot}%{local_initddir}
-install -p -D -m 755 scripts/api-proxy %{buildroot}%{local_initddir}/api-proxy
+install -p -D -m 755 nova_api_proxy/scripts/api-proxy %{buildroot}%{local_initddir}/api-proxy
 
 install -d -m 755 %{buildroot}%{local_proxy_conf}
-install -p -D -m 700 nova-api-proxy.conf %{buildroot}%{local_proxy_conf}/nova-api-proxy.conf
-install -p -D -m 700 api-proxy-paste.ini %{buildroot}%{local_proxy_conf}/api-proxy-paste.ini
+install -p -D -m 700 nova_api_proxy/nova-api-proxy.conf %{buildroot}%{local_proxy_conf}/nova-api-proxy.conf
+install -p -D -m 700 nova_api_proxy/api-proxy-paste.ini %{buildroot}%{local_proxy_conf}/api-proxy-paste.ini
 
 %clean
 rm -rf $RPM_BUILD_ROOT
@@ -61,5 +61,6 @@ rm -rf $RPM_BUILD_ROOT
 %{local_etc_systemd}/*
 %config(noreplace) %{local_proxy_conf}/nova-api-proxy.conf
 %{local_proxy_conf}/api-proxy-paste.ini
-%{pythonroot}/*
+%dir %{pythonroot}/nova_api_proxy
+%{pythonroot}/nova_api_proxy/*
 %{pythonroot}/api_proxy-%{version}.0-py2.7.egg-info/*
diff --git a/nova-api-proxy/nova_api_proxy/LICENSE b/nova-api-proxy/nova-api-proxy/LICENSE
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/LICENSE
rename to nova-api-proxy/nova-api-proxy/LICENSE
diff --git a/nova-api-proxy/nova_api_proxy/__init__.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/__init__.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/__init__.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/__init__.py
diff --git a/nova-api-proxy/nova_api_proxy/api-proxy-paste.ini b/nova-api-proxy/nova-api-proxy/nova_api_proxy/api-proxy-paste.ini
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/api-proxy-paste.ini
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/api-proxy-paste.ini
diff --git a/nova-api-proxy/nova_api_proxy/api_proxy.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/api_proxy.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/api_proxy.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/api_proxy.py
diff --git a/nova-api-proxy/nova_api_proxy/apps/__init__.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/__init__.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/apps/__init__.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/__init__.py
diff --git a/nova-api-proxy/nova_api_proxy/apps/acceptor.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/acceptor.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/apps/acceptor.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/acceptor.py
diff --git a/nova-api-proxy/nova_api_proxy/apps/dispatcher.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/dispatcher.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/apps/dispatcher.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/dispatcher.py
diff --git a/nova-api-proxy/nova_api_proxy/apps/proxy.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/proxy.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/apps/proxy.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/apps/proxy.py
diff --git a/nova-api-proxy/nova_api_proxy/common/__init__.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/__init__.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/common/__init__.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/common/__init__.py
diff --git a/nova-api-proxy/nova_api_proxy/common/config.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/config.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/common/config.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/common/config.py
diff --git a/nova-api-proxy/nova_api_proxy/common/exception.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/exception.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/common/exception.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/common/exception.py
diff --git a/nova-api-proxy/nova_api_proxy/common/histogram.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/histogram.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/common/histogram.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/common/histogram.py
diff --git a/nova-api-proxy/nova_api_proxy/common/log.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/log.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/common/log.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/common/log.py
diff --git a/nova-api-proxy/nova_api_proxy/common/service.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/service.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/common/service.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/common/service.py
diff --git a/nova-api-proxy/nova_api_proxy/common/timestamp.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/timestamp.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/common/timestamp.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/common/timestamp.py
diff --git a/nova-api-proxy/nova_api_proxy/common/utils.py b/nova-api-proxy/nova-api-proxy/nova_api_proxy/common/utils.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/common/utils.py
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/common/utils.py
diff --git a/nova-api-proxy/nova_api_proxy/nova-api-proxy.conf b/nova-api-proxy/nova-api-proxy/nova_api_proxy/nova-api-proxy.conf
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/nova-api-proxy.conf
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/nova-api-proxy.conf
diff --git a/nova-api-proxy/nova_api_proxy/scripts/api-proxy b/nova-api-proxy/nova-api-proxy/nova_api_proxy/scripts/api-proxy
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/scripts/api-proxy
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/scripts/api-proxy
diff --git a/nova-api-proxy/nova_api_proxy/scripts/api-proxy.service b/nova-api-proxy/nova-api-proxy/nova_api_proxy/scripts/api-proxy.service
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/scripts/api-proxy.service
rename to nova-api-proxy/nova-api-proxy/nova_api_proxy/scripts/api-proxy.service
diff --git a/nova-api-proxy/nova_api_proxy/setup.py b/nova-api-proxy/nova-api-proxy/setup.py
similarity index 100%
rename from nova-api-proxy/nova_api_proxy/setup.py
rename to nova-api-proxy/nova-api-proxy/setup.py