Migrate to a src/ layout

Closes #180
LudovicRousseau · Sep 18, 2024 · 6ae8675 · 6ae8675
1 parent 5bf5078
commit 6ae8675
Show file tree

Hide file tree

Showing 170 changed files with 40 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -18,8 +18,8 @@ htmlcov/
 .coverage.*
 
 # Generated by SWIG
-smartcard/scard/scard.py
-smartcard/scard/scard_wrap.c
+src/smartcard/scard/scard.py
+src/smartcard/scard/scard_wrap.c
 
 # Generated by test suite
 local_config.py

diff --git a/ChangeLog b/ChangeLog
@@ -1,6 +1,7 @@
 Unreleased changes
 ==================
    * Remove Python 2 conditional code
+   * Migrate a `src/` layout.
 
 2.1.1 (September 2024)
 ======================

diff --git a/INSTALL.md b/INSTALL.md
@@ -36,8 +36,8 @@ python framework with objects wrapping PCSC API.
 
 Documentation
 -------------
-All documentation is provided in the `smartcard/doc` directory of the
-source distribution.  Examples are provided in the `smartcard/Examples`
+All documentation is provided in the `src/smartcard/doc` directory of the
+source distribution.  Examples are provided in the `src/smartcard/Examples`
 directory of the source distribution.  The binary distribution does not
 include any documentation, tests scripts or examples.
 
@@ -118,11 +118,11 @@ your python distribution, e.g.
 
 Developer documentation, unit tests and examples
 ------------------------------------------------
-The developer documentation is in the `smartcard/doc/` directory of the
+The developer documentation is in the `src/smartcard/doc/` directory of the
 source distribution.
 
-Examples are located in the `smartcard/Examples/` directory, and the pyunit
-unit tests in the `smartcard/test/` directory.
+Examples are located in the `src/smartcard/Examples/` directory, and the pyunit
+unit tests in the `src/smartcard/test/` directory.
 
 Build instructions for packagers
 --------------------------------

diff --git a/MANIFEST.in b/MANIFEST.in
@@ -6,24 +6,24 @@ include MANIFEST.in
 include Makefile
 include README.md
 include TODO
-include smartcard/scard/PcscDefs.i
-include smartcard/scard/PcscTypemaps.i
-include smartcard/scard/gemalto.ver
-include smartcard/scard/helpers.c
-include smartcard/scard/helpers.h
-include smartcard/scard/memlog.h
-include smartcard/scard/pcsctypes.h
-include smartcard/scard/pyscard-reader.h
-include smartcard/scard/scard.def
-include smartcard/scard/scard.i
-include smartcard/scard/scard.rc
-include smartcard/scard/winscarddll.c
-include smartcard/scard/winscarddll.h
-include smartcard/test/configcheck.py
-recursive-include smartcard/Examples *.py *.ico
-recursive-include smartcard/doc *.html *.jpg *.css *.js *.png *.txt
-recursive-include smartcard/test/framework *.txt *.py
-recursive-include smartcard/test/frameworkpcsc *.txt *.py
-recursive-include smartcard/test/scard *.txt *.py
-recursive-include smartcard/wx *.ico
+include src/smartcard/scard/PcscDefs.i
+include src/smartcard/scard/PcscTypemaps.i
+include src/smartcard/scard/gemalto.ver
+include src/smartcard/scard/helpers.c
+include src/smartcard/scard/helpers.h
+include src/smartcard/scard/memlog.h
+include src/smartcard/scard/pcsctypes.h
+include src/smartcard/scard/pyscard-reader.h
+include src/smartcard/scard/scard.def
+include src/smartcard/scard/scard.i
+include src/smartcard/scard/scard.rc
+include src/smartcard/scard/winscarddll.c
+include src/smartcard/scard/winscarddll.h
+include src/smartcard/test/configcheck.py
+recursive-include src/smartcard/Examples *.py *.ico
+recursive-include src/smartcard/doc *.html *.jpg *.css *.js *.png *.txt
+recursive-include src/smartcard/test/framework *.txt *.py
+recursive-include src/smartcard/test/frameworkpcsc *.txt *.py
+recursive-include src/smartcard/test/scard *.txt *.py
+recursive-include src/smartcard/wx *.ico
 include test/*.py
diff --git a/Makefile b/Makefile
@@ -10,16 +10,16 @@ install: clean
 clean:
 	$(PYTHON) setup.py clean
 	rm -rf build
-	rm -f smartcard/scard/_scard*.so
+	rm -f src/smartcard/scard/_scard*.so
 
 pypi: clean
 	# files generated by swig
-	rm -f smartcard/scard/scard.py
-	rm -f smartcard/scard/scard_wrap.c
+	rm -f src/smartcard/scard/scard.py
+	rm -f src/smartcard/scard/scard_wrap.c
 	# files generated by sphinx
-	rm -rf smartcard/doc/_build
+	rm -rf src/smartcard/doc/_build
 	# files generated by pydoctor
-	rm -rf smartcard/doc/html
+	rm -rf src/smartcard/doc/html
 	rm -rf dist
 	$(PYTHON) -m build
 	python3 -m twine upload dist/*

diff --git a/setup.py b/setup.py
@@ -45,7 +45,7 @@
     platform__cc_defines = [('WIN32', '100')]
     platform_swig_opts = ['-DWIN32']
     if 'mingw' not in get_platform():
-        platform_sources = ['smartcard/scard/scard.rc']
+        platform_sources = ['src/smartcard/scard/scard.rc']
     platform_libraries = ['winscard']
 
 elif platform.system() == 'Darwin':
@@ -98,7 +98,7 @@ def run(self):
                    "smartcard.util",
                    "smartcard.wx",
                    ],
-      'package_dir': {"": "."},
+      'package_dir': {"": "src"},
       'package_data': {
                          "smartcard.wx": ["resources/*.ico"],
                        },
@@ -110,17 +110,17 @@ def run(self):
                                     ('VER_PRODUCTVERSION', VERSION_ALT),
                                     ('VER_PRODUCTVERSION_STR', VERSION_STR)] \
                       + platform__cc_defines,
-                      include_dirs=['smartcard/scard/'] \
+                      include_dirs=['src/smartcard/scard/'] \
                       + platform_include_dirs,
-                      sources=["smartcard/scard/helpers.c",
-                               "smartcard/scard/winscarddll.c",
-                               "smartcard/scard/scard.i"] \
+                      sources=["src/smartcard/scard/helpers.c",
+                               "src/smartcard/scard/winscarddll.c",
+                               "src/smartcard/scard/scard.i"] \
                                        + platform_sources,
                       libraries=platform_libraries,
                       extra_compile_args=platform_extra_compile_args,
                       extra_link_args=platform_extra_link_args,
                       swig_opts=['-outdir',
-                                 'smartcard/scard'] \
+                                 'src/smartcard/scard'] \
                       + platform_swig_opts)],
       'extras_require': {
             'Gui': ['wxPython'],

diff --git a/smartcard/ATR.py → src/smartcard/ATR.py b/smartcard/ATR.py → src/smartcard/ATR.py
diff --git a/smartcard/AbstractCardRequest.py → src/smartcard/AbstractCardRequest.py b/smartcard/AbstractCardRequest.py → src/smartcard/AbstractCardRequest.py
diff --git a/smartcard/Card.py → src/smartcard/Card.py b/smartcard/Card.py → src/smartcard/Card.py
diff --git a/smartcard/CardConnection.py → src/smartcard/CardConnection.py b/smartcard/CardConnection.py → src/smartcard/CardConnection.py
diff --git a/smartcard/CardConnectionDecorator.py → src/smartcard/CardConnectionDecorator.py b/smartcard/CardConnectionDecorator.py → src/smartcard/CardConnectionDecorator.py
diff --git a/smartcard/CardConnectionEvent.py → src/smartcard/CardConnectionEvent.py b/smartcard/CardConnectionEvent.py → src/smartcard/CardConnectionEvent.py
diff --git a/smartcard/CardConnectionObserver.py → src/smartcard/CardConnectionObserver.py b/smartcard/CardConnectionObserver.py → src/smartcard/CardConnectionObserver.py
diff --git a/smartcard/CardMonitoring.py → src/smartcard/CardMonitoring.py b/smartcard/CardMonitoring.py → src/smartcard/CardMonitoring.py
diff --git a/smartcard/CardNames.py → src/smartcard/CardNames.py b/smartcard/CardNames.py → src/smartcard/CardNames.py
diff --git a/smartcard/CardRequest.py → src/smartcard/CardRequest.py b/smartcard/CardRequest.py → src/smartcard/CardRequest.py
diff --git a/smartcard/CardService.py → src/smartcard/CardService.py b/smartcard/CardService.py → src/smartcard/CardService.py
diff --git a/smartcard/CardType.py → src/smartcard/CardType.py b/smartcard/CardType.py → src/smartcard/CardType.py
diff --git a/smartcard/ClassLoader.py → src/smartcard/ClassLoader.py b/smartcard/ClassLoader.py → src/smartcard/ClassLoader.py
diff --git a/smartcard/Examples/framework/sample_ATR.py → ...martcard/Examples/framework/sample_ATR.py b/smartcard/Examples/framework/sample_ATR.py → ...martcard/Examples/framework/sample_ATR.py
diff --git a/...amework/sample_CardConnectionDecorator.py → ...amework/sample_CardConnectionDecorator.py b/...amework/sample_CardConnectionDecorator.py → ...amework/sample_CardConnectionDecorator.py
diff --git a/...amework/sample_ConsoleConnectionTracer.py → ...amework/sample_ConsoleConnectionTracer.py b/...amework/sample_ConsoleConnectionTracer.py → ...amework/sample_ConsoleConnectionTracer.py
diff --git a/...amples/framework/sample_CustomCardType.py → ...amples/framework/sample_CustomCardType.py b/...amples/framework/sample_CustomCardType.py → ...amples/framework/sample_CustomCardType.py
diff --git a/...es/framework/sample_CustomErrorChecker.py → ...es/framework/sample_CustomErrorChecker.py b/...es/framework/sample_CustomErrorChecker.py → ...es/framework/sample_CustomErrorChecker.py
diff --git a/...xamples/framework/sample_ErrorChecking.py → ...xamples/framework/sample_ErrorChecking.py b/...xamples/framework/sample_ErrorChecking.py → ...xamples/framework/sample_ErrorChecking.py
diff --git a/...amework/sample_ExclusiveCardConnection.py → ...amework/sample_ExclusiveCardConnection.py b/...amework/sample_ExclusiveCardConnection.py → ...amework/sample_ExclusiveCardConnection.py
diff --git a/...Examples/framework/sample_MonitorCards.py → ...Examples/framework/sample_MonitorCards.py b/...Examples/framework/sample_MonitorCards.py → ...Examples/framework/sample_MonitorCards.py
diff --git a/...amework/sample_MonitorCardsAndTransmit.py → ...amework/sample_MonitorCardsAndTransmit.py b/...amework/sample_MonitorCardsAndTransmit.py → ...amework/sample_MonitorCardsAndTransmit.py
diff --git a/...amples/framework/sample_MonitorReaders.py → ...amples/framework/sample_MonitorReaders.py b/...amples/framework/sample_MonitorReaders.py → ...amples/framework/sample_MonitorReaders.py
diff --git a/.../framework/sample_TransmitCardObserver.py → .../framework/sample_TransmitCardObserver.py b/.../framework/sample_TransmitCardObserver.py → .../framework/sample_TransmitCardObserver.py
diff --git a/...framework/sample_apduTracerInterpreter.py → ...framework/sample_apduTracerInterpreter.py b/...framework/sample_apduTracerInterpreter.py → ...framework/sample_apduTracerInterpreter.py
diff --git a/.../Examples/framework/sample_toHexString.py → .../Examples/framework/sample_toHexString.py b/.../Examples/framework/sample_toHexString.py → .../Examples/framework/sample_toHexString.py
diff --git a/...card/Examples/scard-api/sample_control.py → ...card/Examples/scard-api/sample_control.py b/...card/Examples/scard-api/sample_control.py → ...card/Examples/scard-api/sample_control.py
diff --git a/...tcard/Examples/scard-api/sample_getATR.py → ...tcard/Examples/scard-api/sample_getATR.py b/...tcard/Examples/scard-api/sample_getATR.py → ...tcard/Examples/scard-api/sample_getATR.py
diff --git a/...rd/Examples/scard-api/sample_getAttrib.py → ...rd/Examples/scard-api/sample_getAttrib.py b/...rd/Examples/scard-api/sample_getAttrib.py → ...rd/Examples/scard-api/sample_getAttrib.py
diff --git a/...mples/scard-api/sample_getStatusChange.py → ...mples/scard-api/sample_getStatusChange.py b/...mples/scard-api/sample_getStatusChange.py → ...mples/scard-api/sample_getStatusChange.py
diff --git a/...rd/Examples/scard-api/sample_listCards.py → ...rd/Examples/scard-api/sample_listCards.py b/...rd/Examples/scard-api/sample_listCards.py → ...rd/Examples/scard-api/sample_listCards.py
diff --git a/...amples/scard-api/sample_listInterfaces.py → ...amples/scard-api/sample_listInterfaces.py b/...amples/scard-api/sample_listInterfaces.py → ...amples/scard-api/sample_listInterfaces.py
diff --git a/.../Examples/scard-api/sample_locateCards.py → .../Examples/scard-api/sample_locateCards.py b/.../Examples/scard-api/sample_locateCards.py → .../Examples/scard-api/sample_locateCards.py
diff --git a/...tcard/Examples/scard-api/sample_pinpad.py → ...tcard/Examples/scard-api/sample_pinpad.py b/...tcard/Examples/scard-api/sample_pinpad.py → ...tcard/Examples/scard-api/sample_pinpad.py
diff --git a/...Examples/scard-api/sample_readerGroups.py → ...Examples/scard-api/sample_readerGroups.py b/...Examples/scard-api/sample_readerGroups.py → ...Examples/scard-api/sample_readerGroups.py
diff --git a/...card/Examples/scard-api/sample_readers.py → ...card/Examples/scard-api/sample_readers.py b/...card/Examples/scard-api/sample_readers.py → ...card/Examples/scard-api/sample_readers.py
diff --git a/...mples/scard-api/sample_selectDFTelecom.py → ...mples/scard-api/sample_selectDFTelecom.py b/...mples/scard-api/sample_selectDFTelecom.py → ...mples/scard-api/sample_selectDFTelecom.py
diff --git a/.../Examples/scard-api/sample_transaction.py → .../Examples/scard-api/sample_transaction.py b/.../Examples/scard-api/sample_transaction.py → .../Examples/scard-api/sample_transaction.py
diff --git a/smartcard/Examples/simple/getATR.py → src/smartcard/Examples/simple/getATR.py b/smartcard/Examples/simple/getATR.py → src/smartcard/Examples/simple/getATR.py
diff --git a/smartcard/Examples/simple/getATR_context.py → ...artcard/Examples/simple/getATR_context.py b/smartcard/Examples/simple/getATR_context.py → ...artcard/Examples/simple/getATR_context.py
diff --git a/...tcard/Examples/simple/selectDF_TELECOM.py → ...tcard/Examples/simple/selectDF_TELECOM.py b/...tcard/Examples/simple/selectDF_TELECOM.py → ...tcard/Examples/simple/selectDF_TELECOM.py
diff --git a/smartcard/Examples/simple/simpleAPDU.py → src/smartcard/Examples/simple/simpleAPDU.py b/smartcard/Examples/simple/simpleAPDU.py → src/smartcard/Examples/simple/simpleAPDU.py
diff --git a/.../wx/apdumanager/SampleAPDUManagerPanel.py → .../wx/apdumanager/SampleAPDUManagerPanel.py b/.../wx/apdumanager/SampleAPDUManagerPanel.py → .../wx/apdumanager/SampleAPDUManagerPanel.py
diff --git a/...rd/Examples/wx/apdumanager/apdumanager.py → ...rd/Examples/wx/apdumanager/apdumanager.py b/...rd/Examples/wx/apdumanager/apdumanager.py → ...rd/Examples/wx/apdumanager/apdumanager.py
diff --git a/...les/wx/apdumanager/images/mysmartcard.ico → ...les/wx/apdumanager/images/mysmartcard.ico b/...les/wx/apdumanager/images/mysmartcard.ico → ...les/wx/apdumanager/images/mysmartcard.ico
diff --git a/smartcard/Examples/wx/apdumanager/setup.py → ...martcard/Examples/wx/apdumanager/setup.py b/smartcard/Examples/wx/apdumanager/setup.py → ...martcard/Examples/wx/apdumanager/setup.py
diff --git a/...rd/Examples/wx/cardmonitor/cardmonitor.py → ...rd/Examples/wx/cardmonitor/cardmonitor.py b/...rd/Examples/wx/cardmonitor/cardmonitor.py → ...rd/Examples/wx/cardmonitor/cardmonitor.py
diff --git a/...les/wx/cardmonitor/images/mysmartcard.ico → ...les/wx/cardmonitor/images/mysmartcard.ico b/...les/wx/cardmonitor/images/mysmartcard.ico → ...les/wx/cardmonitor/images/mysmartcard.ico
diff --git a/smartcard/Examples/wx/cardmonitor/setup.py → ...martcard/Examples/wx/cardmonitor/setup.py b/smartcard/Examples/wx/cardmonitor/setup.py → ...martcard/Examples/wx/cardmonitor/setup.py
diff --git a/smartcard/Examples/wx/pcscdiag/pcscdiag.py → ...martcard/Examples/wx/pcscdiag/pcscdiag.py b/smartcard/Examples/wx/pcscdiag/pcscdiag.py → ...martcard/Examples/wx/pcscdiag/pcscdiag.py
diff --git a/...s/wx/readerviewer/images/readerviewer.ico → ...s/wx/readerviewer/images/readerviewer.ico b/...s/wx/readerviewer/images/readerviewer.ico → ...s/wx/readerviewer/images/readerviewer.ico
diff --git a/.../Examples/wx/readerviewer/readerviewer.py → .../Examples/wx/readerviewer/readerviewer.py b/.../Examples/wx/readerviewer/readerviewer.py → .../Examples/wx/readerviewer/readerviewer.py
diff --git a/smartcard/Examples/wx/readerviewer/setup.py → ...artcard/Examples/wx/readerviewer/setup.py b/smartcard/Examples/wx/readerviewer/setup.py → ...artcard/Examples/wx/readerviewer/setup.py
diff --git a/smartcard/Exceptions.py → src/smartcard/Exceptions.py b/smartcard/Exceptions.py → src/smartcard/Exceptions.py
diff --git a/smartcard/ExclusiveConnectCardConnection.py → ...artcard/ExclusiveConnectCardConnection.py b/smartcard/ExclusiveConnectCardConnection.py → ...artcard/ExclusiveConnectCardConnection.py
diff --git a/smartcard/ExclusiveTransmitCardConnection.py → ...rtcard/ExclusiveTransmitCardConnection.py b/smartcard/ExclusiveTransmitCardConnection.py → ...rtcard/ExclusiveTransmitCardConnection.py
diff --git a/smartcard/Observer.py → src/smartcard/Observer.py b/smartcard/Observer.py → src/smartcard/Observer.py
diff --git a/smartcard/PassThruCardService.py → src/smartcard/PassThruCardService.py b/smartcard/PassThruCardService.py → src/smartcard/PassThruCardService.py
diff --git a/smartcard/ReaderMonitoring.py → src/smartcard/ReaderMonitoring.py b/smartcard/ReaderMonitoring.py → src/smartcard/ReaderMonitoring.py
diff --git a/smartcard/Session.py → src/smartcard/Session.py b/smartcard/Session.py → src/smartcard/Session.py
diff --git a/smartcard/Synchronization.py → src/smartcard/Synchronization.py b/smartcard/Synchronization.py → src/smartcard/Synchronization.py
diff --git a/smartcard/System.py → src/smartcard/System.py b/smartcard/System.py → src/smartcard/System.py
diff --git a/smartcard/__init__.py → src/smartcard/__init__.py b/smartcard/__init__.py → src/smartcard/__init__.py
diff --git a/smartcard/doc/Makefile → src/smartcard/doc/Makefile b/smartcard/doc/Makefile → src/smartcard/doc/Makefile
diff --git a/smartcard/doc/conf.py → src/smartcard/doc/conf.py b/smartcard/doc/conf.py → src/smartcard/doc/conf.py
diff --git a/smartcard/doc/generate.sh → src/smartcard/doc/generate.sh b/smartcard/doc/generate.sh → src/smartcard/doc/generate.sh
diff --git a/smartcard/doc/images/pyscard.jpg → src/smartcard/doc/images/pyscard.jpg b/smartcard/doc/images/pyscard.jpg → src/smartcard/doc/images/pyscard.jpg
diff --git a/smartcard/doc/images/sflogo.php.png → src/smartcard/doc/images/sflogo.php.png b/smartcard/doc/images/sflogo.php.png → src/smartcard/doc/images/sflogo.php.png
diff --git a/smartcard/doc/index.rst → src/smartcard/doc/index.rst b/smartcard/doc/index.rst → src/smartcard/doc/index.rst
diff --git a/smartcard/doc/license.rst → src/smartcard/doc/license.rst b/smartcard/doc/license.rst → src/smartcard/doc/license.rst
diff --git a/smartcard/doc/pyscard-framework.rst → src/smartcard/doc/pyscard-framework.rst b/smartcard/doc/pyscard-framework.rst → src/smartcard/doc/pyscard-framework.rst
diff --git a/smartcard/doc/pyscard-wrapper.rst → src/smartcard/doc/pyscard-wrapper.rst b/smartcard/doc/pyscard-wrapper.rst → src/smartcard/doc/pyscard-wrapper.rst
diff --git a/smartcard/doc/sync.sh → src/smartcard/doc/sync.sh b/smartcard/doc/sync.sh → src/smartcard/doc/sync.sh
diff --git a/smartcard/doc/user-guide.rst → src/smartcard/doc/user-guide.rst b/smartcard/doc/user-guide.rst → src/smartcard/doc/user-guide.rst
diff --git a/smartcard/guid.py → src/smartcard/guid.py b/smartcard/guid.py → src/smartcard/guid.py
diff --git a/smartcard/pcsc/PCSCCardConnection.py → src/smartcard/pcsc/PCSCCardConnection.py b/smartcard/pcsc/PCSCCardConnection.py → src/smartcard/pcsc/PCSCCardConnection.py
diff --git a/smartcard/pcsc/PCSCCardRequest.py → src/smartcard/pcsc/PCSCCardRequest.py b/smartcard/pcsc/PCSCCardRequest.py → src/smartcard/pcsc/PCSCCardRequest.py
diff --git a/smartcard/pcsc/PCSCContext.py → src/smartcard/pcsc/PCSCContext.py b/smartcard/pcsc/PCSCContext.py → src/smartcard/pcsc/PCSCContext.py
diff --git a/smartcard/pcsc/PCSCExceptions.py → src/smartcard/pcsc/PCSCExceptions.py b/smartcard/pcsc/PCSCExceptions.py → src/smartcard/pcsc/PCSCExceptions.py
diff --git a/smartcard/pcsc/PCSCPart10.py → src/smartcard/pcsc/PCSCPart10.py b/smartcard/pcsc/PCSCPart10.py → src/smartcard/pcsc/PCSCPart10.py
diff --git a/smartcard/pcsc/PCSCReader.py → src/smartcard/pcsc/PCSCReader.py b/smartcard/pcsc/PCSCReader.py → src/smartcard/pcsc/PCSCReader.py
diff --git a/smartcard/pcsc/PCSCReaderGroups.py → src/smartcard/pcsc/PCSCReaderGroups.py b/smartcard/pcsc/PCSCReaderGroups.py → src/smartcard/pcsc/PCSCReaderGroups.py
diff --git a/smartcard/pcsc/__init__.py → src/smartcard/pcsc/__init__.py b/smartcard/pcsc/__init__.py → src/smartcard/pcsc/__init__.py
diff --git a/smartcard/pyro/PyroReader.py → src/smartcard/pyro/PyroReader.py b/smartcard/pyro/PyroReader.py → src/smartcard/pyro/PyroReader.py
diff --git a/smartcard/pyro/__init__.py → src/smartcard/pyro/__init__.py b/smartcard/pyro/__init__.py → src/smartcard/pyro/__init__.py
diff --git a/smartcard/pyro/server/PyroDaemon.py → src/smartcard/pyro/server/PyroDaemon.py b/smartcard/pyro/server/PyroDaemon.py → src/smartcard/pyro/server/PyroDaemon.py
diff --git a/smartcard/pyro/server/PyroEventServer.py → src/smartcard/pyro/server/PyroEventServer.py b/smartcard/pyro/server/PyroEventServer.py → src/smartcard/pyro/server/PyroEventServer.py
diff --git a/smartcard/pyro/server/PyroNameServer.py → src/smartcard/pyro/server/PyroNameServer.py b/smartcard/pyro/server/PyroNameServer.py → src/smartcard/pyro/server/PyroNameServer.py
diff --git a/...tcard/pyro/server/RemoteCardConnection.py → ...tcard/pyro/server/RemoteCardConnection.py b/...tcard/pyro/server/RemoteCardConnection.py → ...tcard/pyro/server/RemoteCardConnection.py
diff --git a/smartcard/pyro/server/RemoteReaderServer.py → ...artcard/pyro/server/RemoteReaderServer.py b/smartcard/pyro/server/RemoteReaderServer.py → ...artcard/pyro/server/RemoteReaderServer.py
diff --git a/smartcard/pyro/server/__init__.py → src/smartcard/pyro/server/__init__.py b/smartcard/pyro/server/__init__.py → src/smartcard/pyro/server/__init__.py
diff --git a/smartcard/reader/Reader.py → src/smartcard/reader/Reader.py b/smartcard/reader/Reader.py → src/smartcard/reader/Reader.py
diff --git a/smartcard/reader/ReaderFactory.py → src/smartcard/reader/ReaderFactory.py b/smartcard/reader/ReaderFactory.py → src/smartcard/reader/ReaderFactory.py
diff --git a/smartcard/reader/ReaderGroups.py → src/smartcard/reader/ReaderGroups.py b/smartcard/reader/ReaderGroups.py → src/smartcard/reader/ReaderGroups.py
diff --git a/smartcard/reader/__init__.py → src/smartcard/reader/__init__.py b/smartcard/reader/__init__.py → src/smartcard/reader/__init__.py
diff --git a/smartcard/scard/PcscDefs.i → src/smartcard/scard/PcscDefs.i b/smartcard/scard/PcscDefs.i → src/smartcard/scard/PcscDefs.i
diff --git a/smartcard/scard/PcscTypemaps.i → src/smartcard/scard/PcscTypemaps.i b/smartcard/scard/PcscTypemaps.i → src/smartcard/scard/PcscTypemaps.i
diff --git a/smartcard/scard/__init__.py → src/smartcard/scard/__init__.py b/smartcard/scard/__init__.py → src/smartcard/scard/__init__.py
diff --git a/smartcard/scard/gemalto.ver → src/smartcard/scard/gemalto.ver b/smartcard/scard/gemalto.ver → src/smartcard/scard/gemalto.ver
diff --git a/smartcard/scard/helpers.c → src/smartcard/scard/helpers.c b/smartcard/scard/helpers.c → src/smartcard/scard/helpers.c
diff --git a/smartcard/scard/helpers.h → src/smartcard/scard/helpers.h b/smartcard/scard/helpers.h → src/smartcard/scard/helpers.h
diff --git a/smartcard/scard/makefile → src/smartcard/scard/makefile b/smartcard/scard/makefile → src/smartcard/scard/makefile
diff --git a/smartcard/scard/memlog.h → src/smartcard/scard/memlog.h b/smartcard/scard/memlog.h → src/smartcard/scard/memlog.h
diff --git a/smartcard/scard/pcsctypes.h → src/smartcard/scard/pcsctypes.h b/smartcard/scard/pcsctypes.h → src/smartcard/scard/pcsctypes.h
diff --git a/smartcard/scard/pyscard-reader.h → src/smartcard/scard/pyscard-reader.h b/smartcard/scard/pyscard-reader.h → src/smartcard/scard/pyscard-reader.h
diff --git a/smartcard/scard/scard.def → src/smartcard/scard/scard.def b/smartcard/scard/scard.def → src/smartcard/scard/scard.def
diff --git a/smartcard/scard/scard.i → src/smartcard/scard/scard.i b/smartcard/scard/scard.i → src/smartcard/scard/scard.i
diff --git a/smartcard/scard/scard.rc → src/smartcard/scard/scard.rc b/smartcard/scard/scard.rc → src/smartcard/scard/scard.rc
diff --git a/smartcard/scard/winscarddll.c → src/smartcard/scard/winscarddll.c b/smartcard/scard/winscarddll.c → src/smartcard/scard/winscarddll.c
diff --git a/smartcard/scard/winscarddll.h → src/smartcard/scard/winscarddll.h b/smartcard/scard/winscarddll.h → src/smartcard/scard/winscarddll.h
diff --git a/smartcard/sw/ErrorChecker.py → src/smartcard/sw/ErrorChecker.py b/smartcard/sw/ErrorChecker.py → src/smartcard/sw/ErrorChecker.py
diff --git a/smartcard/sw/ErrorCheckingChain.py → src/smartcard/sw/ErrorCheckingChain.py b/smartcard/sw/ErrorCheckingChain.py → src/smartcard/sw/ErrorCheckingChain.py
diff --git a/smartcard/sw/ISO7816_4ErrorChecker.py → src/smartcard/sw/ISO7816_4ErrorChecker.py b/smartcard/sw/ISO7816_4ErrorChecker.py → src/smartcard/sw/ISO7816_4ErrorChecker.py
diff --git a/smartcard/sw/ISO7816_4_SW1ErrorChecker.py → ...smartcard/sw/ISO7816_4_SW1ErrorChecker.py b/smartcard/sw/ISO7816_4_SW1ErrorChecker.py → ...smartcard/sw/ISO7816_4_SW1ErrorChecker.py
diff --git a/smartcard/sw/ISO7816_8ErrorChecker.py → src/smartcard/sw/ISO7816_8ErrorChecker.py b/smartcard/sw/ISO7816_8ErrorChecker.py → src/smartcard/sw/ISO7816_8ErrorChecker.py
diff --git a/smartcard/sw/ISO7816_9ErrorChecker.py → src/smartcard/sw/ISO7816_9ErrorChecker.py b/smartcard/sw/ISO7816_9ErrorChecker.py → src/smartcard/sw/ISO7816_9ErrorChecker.py
diff --git a/smartcard/sw/SWExceptions.py → src/smartcard/sw/SWExceptions.py b/smartcard/sw/SWExceptions.py → src/smartcard/sw/SWExceptions.py
diff --git a/smartcard/sw/__init__.py → src/smartcard/sw/__init__.py b/smartcard/sw/__init__.py → src/smartcard/sw/__init__.py
diff --git a/smartcard/sw/op21_ErrorChecker.py → src/smartcard/sw/op21_ErrorChecker.py b/smartcard/sw/op21_ErrorChecker.py → src/smartcard/sw/op21_ErrorChecker.py
diff --git a/smartcard/test/configcheck.py → src/smartcard/test/configcheck.py b/smartcard/test/configcheck.py → src/smartcard/test/configcheck.py
diff --git a/smartcard/test/framework/readme.txt → src/smartcard/test/framework/readme.txt b/smartcard/test/framework/readme.txt → src/smartcard/test/framework/readme.txt
diff --git a/smartcard/test/framework/testcase_ATR.py → src/smartcard/test/framework/testcase_ATR.py b/smartcard/test/framework/testcase_ATR.py → src/smartcard/test/framework/testcase_ATR.py
diff --git a/smartcard/test/framework/testcase_CAtr.py → ...smartcard/test/framework/testcase_CAtr.py b/smartcard/test/framework/testcase_CAtr.py → ...smartcard/test/framework/testcase_CAtr.py
diff --git a/smartcard/test/framework/testcase_Card.py → ...smartcard/test/framework/testcase_Card.py b/smartcard/test/framework/testcase_Card.py → ...smartcard/test/framework/testcase_Card.py
diff --git a/...test/framework/testcase_CardConnection.py → ...test/framework/testcase_CardConnection.py b/...test/framework/testcase_CardConnection.py → ...test/framework/testcase_CardConnection.py
diff --git a/...rd/test/framework/testcase_CardMonitor.py → ...rd/test/framework/testcase_CardMonitor.py b/...rd/test/framework/testcase_CardMonitor.py → ...rd/test/framework/testcase_CardMonitor.py
diff --git a/...rd/test/framework/testcase_CardRequest.py → ...rd/test/framework/testcase_CardRequest.py b/...rd/test/framework/testcase_CardRequest.py → ...rd/test/framework/testcase_CardRequest.py
diff --git a/...rd/test/framework/testcase_CardService.py → ...rd/test/framework/testcase_CardService.py b/...rd/test/framework/testcase_CardService.py → ...rd/test/framework/testcase_CardService.py
diff --git a/...tcard/test/framework/testcase_CardType.py → ...tcard/test/framework/testcase_CardType.py b/...tcard/test/framework/testcase_CardType.py → ...tcard/test/framework/testcase_CardType.py
diff --git a/.../test/framework/testcase_ErrorChecking.py → .../test/framework/testcase_ErrorChecking.py b/.../test/framework/testcase_ErrorChecking.py → .../test/framework/testcase_ErrorChecking.py
diff --git a/...ework/testcase_ExclusiveCardConnection.py → ...ework/testcase_ExclusiveCardConnection.py b/...ework/testcase_ExclusiveCardConnection.py → ...ework/testcase_ExclusiveCardConnection.py
diff --git a/...d/test/framework/testcase_readergroups.py → ...d/test/framework/testcase_readergroups.py b/...d/test/framework/testcase_readergroups.py → ...d/test/framework/testcase_readergroups.py
diff --git a/.../test/framework/testcase_readermonitor.py → .../test/framework/testcase_readermonitor.py b/.../test/framework/testcase_readermonitor.py → .../test/framework/testcase_readermonitor.py
diff --git a/...framework/testcase_readermonitorstress.py → ...framework/testcase_readermonitorstress.py b/...framework/testcase_readermonitorstress.py → ...framework/testcase_readermonitorstress.py
diff --git a/smartcard/test/framework/testcase_readers.py → ...rtcard/test/framework/testcase_readers.py b/smartcard/test/framework/testcase_readers.py → ...rtcard/test/framework/testcase_readers.py
diff --git a/smartcard/test/framework/testcase_ulist.py → ...martcard/test/framework/testcase_ulist.py b/smartcard/test/framework/testcase_ulist.py → ...martcard/test/framework/testcase_ulist.py
diff --git a/smartcard/test/framework/testcase_utils.py → ...martcard/test/framework/testcase_utils.py b/smartcard/test/framework/testcase_utils.py → ...martcard/test/framework/testcase_utils.py
diff --git a/...ard/test/framework/testsuite_framework.py → ...ard/test/framework/testsuite_framework.py b/...ard/test/framework/testsuite_framework.py → ...ard/test/framework/testsuite_framework.py
diff --git a/smartcard/test/frameworkpcsc/readme.txt → src/smartcard/test/frameworkpcsc/readme.txt b/smartcard/test/frameworkpcsc/readme.txt → src/smartcard/test/frameworkpcsc/readme.txt
diff --git a/...rameworkpcsc/testcase_pcscreadergroups.py → ...rameworkpcsc/testcase_pcscreadergroups.py b/...rameworkpcsc/testcase_pcscreadergroups.py → ...rameworkpcsc/testcase_pcscreadergroups.py
diff --git a/.../frameworkpcsc/testsuite_frameworkpcsc.py → .../frameworkpcsc/testsuite_frameworkpcsc.py b/.../frameworkpcsc/testsuite_frameworkpcsc.py → .../frameworkpcsc/testsuite_frameworkpcsc.py
diff --git a/...test/manual/testcase_manualCardRequest.py → ...test/manual/testcase_manualCardRequest.py b/...test/manual/testcase_manualCardRequest.py → ...test/manual/testcase_manualCardRequest.py
diff --git a/smartcard/test/scard/readme.txt → src/smartcard/test/scard/readme.txt b/smartcard/test/scard/readme.txt → src/smartcard/test/scard/readme.txt
diff --git a/smartcard/test/scard/testcase_getatr.py → src/smartcard/test/scard/testcase_getatr.py b/smartcard/test/scard/testcase_getatr.py → src/smartcard/test/scard/testcase_getatr.py
diff --git a/smartcard/test/scard/testcase_getattrib.py → ...martcard/test/scard/testcase_getattrib.py b/smartcard/test/scard/testcase_getattrib.py → ...martcard/test/scard/testcase_getattrib.py
diff --git a/...rd/test/scard/testcase_geterrormessage.py → ...rd/test/scard/testcase_geterrormessage.py b/...rd/test/scard/testcase_geterrormessage.py → ...rd/test/scard/testcase_geterrormessage.py
diff --git a/smartcard/test/scard/testcase_listcards.py → ...martcard/test/scard/testcase_listcards.py b/smartcard/test/scard/testcase_listcards.py → ...martcard/test/scard/testcase_listcards.py
diff --git a/smartcard/test/scard/testcase_locatecards.py → ...rtcard/test/scard/testcase_locatecards.py b/smartcard/test/scard/testcase_locatecards.py → ...rtcard/test/scard/testcase_locatecards.py
diff --git a/...tcard/test/scard/testcase_readergroups.py → ...tcard/test/scard/testcase_readergroups.py b/...tcard/test/scard/testcase_readergroups.py → ...tcard/test/scard/testcase_readergroups.py
diff --git a/smartcard/test/scard/testcase_returncodes.py → ...rtcard/test/scard/testcase_returncodes.py b/smartcard/test/scard/testcase_returncodes.py → ...rtcard/test/scard/testcase_returncodes.py
diff --git a/smartcard/test/scard/testcase_transaction.py → ...rtcard/test/scard/testcase_transaction.py b/smartcard/test/scard/testcase_transaction.py → ...rtcard/test/scard/testcase_transaction.py
diff --git a/smartcard/test/scard/testsuite_scard.py → src/smartcard/test/scard/testsuite_scard.py b/smartcard/test/scard/testsuite_scard.py → src/smartcard/test/scard/testsuite_scard.py
diff --git a/smartcard/ulist.py → src/smartcard/ulist.py b/smartcard/ulist.py → src/smartcard/ulist.py
diff --git a/smartcard/util/__init__.py → src/smartcard/util/__init__.py b/smartcard/util/__init__.py → src/smartcard/util/__init__.py
diff --git a/smartcard/wx/APDUHexValidator.py → src/smartcard/wx/APDUHexValidator.py b/smartcard/wx/APDUHexValidator.py → src/smartcard/wx/APDUHexValidator.py
diff --git a/smartcard/wx/APDUTracerPanel.py → src/smartcard/wx/APDUTracerPanel.py b/smartcard/wx/APDUTracerPanel.py → src/smartcard/wx/APDUTracerPanel.py
diff --git a/smartcard/wx/CardAndReaderTreePanel.py → src/smartcard/wx/CardAndReaderTreePanel.py b/smartcard/wx/CardAndReaderTreePanel.py → src/smartcard/wx/CardAndReaderTreePanel.py
diff --git a/smartcard/wx/ReaderToolbar.py → src/smartcard/wx/ReaderToolbar.py b/smartcard/wx/ReaderToolbar.py → src/smartcard/wx/ReaderToolbar.py
diff --git a/smartcard/wx/SimpleSCardApp.py → src/smartcard/wx/SimpleSCardApp.py b/smartcard/wx/SimpleSCardApp.py → src/smartcard/wx/SimpleSCardApp.py
diff --git a/smartcard/wx/SimpleSCardAppEventObserver.py → ...artcard/wx/SimpleSCardAppEventObserver.py b/smartcard/wx/SimpleSCardAppEventObserver.py → ...artcard/wx/SimpleSCardAppEventObserver.py
diff --git a/smartcard/wx/SimpleSCardAppFrame.py → src/smartcard/wx/SimpleSCardAppFrame.py b/smartcard/wx/SimpleSCardAppFrame.py → src/smartcard/wx/SimpleSCardAppFrame.py
diff --git a/smartcard/wx/__init__.py → src/smartcard/wx/__init__.py b/smartcard/wx/__init__.py → src/smartcard/wx/__init__.py
diff --git a/smartcard/wx/resources/reader.ico → src/smartcard/wx/resources/reader.ico b/smartcard/wx/resources/reader.ico → src/smartcard/wx/resources/reader.ico
diff --git a/smartcard/wx/resources/smartcard.ico → src/smartcard/wx/resources/smartcard.ico b/smartcard/wx/resources/smartcard.ico → src/smartcard/wx/resources/smartcard.ico