diff --git a/pyproject.toml b/pyproject.toml
index 94aa589..918ff52 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -43,7 +43,7 @@ dev_template = "{tag}"
 dirty_template = "{tag}"
 
 [tool.setuptools.packages.find]
-where = ["dpx"]  # list of folders that contain the packages (["."] by default)
+where = ["src"]  # list of folders that contain the packages (["."] by default)
 include = ["*"]  # package names should match these glob patterns (["*"] by default)
 exclude = []  # exclude packages matching these glob patterns (empty by default)
 namespaces = false  # to disable scanning PEP 420 namespaces (true by default)
diff --git a/dpx/__init__.py b/src/diffpy/__init__.py
similarity index 100%
rename from dpx/__init__.py
rename to src/diffpy/__init__.py
diff --git a/dpx/confutils/__init__.py b/src/diffpy/srxconfutils/__init__.py
similarity index 87%
rename from dpx/confutils/__init__.py
rename to src/diffpy/srxconfutils/__init__.py
index 8e62eb1..7b91ed3 100644
--- a/dpx/confutils/__init__.py
+++ b/src/diffpy/srxconfutils/__init__.py
@@ -13,10 +13,10 @@
 ##############################################################################
 
 # package version
-from dpx.confutils.version import __version__
+from diffpy.srxconfutils.version import __version__
 
 # some convenience imports
-from dpx.confutils.config import ConfigBase, ConfigBase
+from diffpy.srxconfutils.config import ConfigBase, ConfigBase
 
 # unit tests
 def test():
diff --git a/dpx/confutils/config.py b/src/diffpy/srxconfutils/config.py
similarity index 99%
rename from dpx/confutils/config.py
rename to src/diffpy/srxconfutils/config.py
index f784e7f..c508365 100644
--- a/dpx/confutils/config.py
+++ b/src/diffpy/srxconfutils/config.py
@@ -33,7 +33,7 @@
 except:
     from ordereddict import OrderedDict
 
-from dpx.confutils.tools import _configPropertyRad, _configPropertyR, \
+from diffpy.srxconfutils.tools import _configPropertyRad, _configPropertyR, \
     _configPropertyRW, str2bool, opt2Str, str2Opt, StrConv, FakeConfigFile
 
 class ConfigBase(object):
diff --git a/dpx/confutils/configtraits.py b/src/diffpy/srxconfutils/configtraits.py
similarity index 98%
rename from dpx/confutils/configtraits.py
rename to src/diffpy/srxconfutils/configtraits.py
index d80d04c..502f63e 100644
--- a/dpx/confutils/configtraits.py
+++ b/src/diffpy/srxconfutils/configtraits.py
@@ -34,9 +34,9 @@
                         Event, CFloat, CInt, on_trait_change
 from traitsui.api import Item, Group, View
 
-from dpx.confutils.tools import _configPropertyRad, _configPropertyR, _configPropertyRW, \
+from diffpy.srxconfutils.tools import _configPropertyRad, _configPropertyR, _configPropertyRW, \
                                 str2bool, opt2Str, str2Opt, StrConv
-from dpx.confutils.config import ConfigBase
+from diffpy.srxconfutils.config import ConfigBase
 
 class ConfigBaseTraits(HasTraits, ConfigBase):
     '''
diff --git a/dpx/confutils/gitarchive.cfg b/src/diffpy/srxconfutils/gitarchive.cfg
similarity index 100%
rename from dpx/confutils/gitarchive.cfg
rename to src/diffpy/srxconfutils/gitarchive.cfg
diff --git a/dpx/confutils/tools.py b/src/diffpy/srxconfutils/tools.py
similarity index 100%
rename from dpx/confutils/tools.py
rename to src/diffpy/srxconfutils/tools.py
diff --git a/dpx/confutils/version.py b/src/diffpy/srxconfutils/version.py
similarity index 100%
rename from dpx/confutils/version.py
rename to src/diffpy/srxconfutils/version.py