diff --git a/.php-cs-fixer.php b/.php-cs-fixer.php
index 6774ea00..ce9ab28e 100644
--- a/.php-cs-fixer.php
+++ b/.php-cs-fixer.php
@@ -4,7 +4,7 @@
 
 $finder = PhpCsFixer\Finder::create()
     ->in([
-        __DIR__ . '/lib',
+        __DIR__ . '/src',
         __DIR__ . '/Tests',
     ]);
 
diff --git a/README.md b/README.md
index 37e6977b..f64c0315 100644
--- a/README.md
+++ b/README.md
@@ -96,6 +96,6 @@ This library aims to be compatible with all banks that support [FinTS V3.0](http
 PIN/TAN-based authentication according to PSD2 regulations, which includes most relevant German banks. Currently, it
 works with the most popular banks at least, and probably with most others too. Some corner cases (e.g. Mehrfach-TANs or
 SMS-Abbuchungskonto for mTAN fees) are not and probably will not be supported.
-Those banks with a dedicated [integration test](/lib/Tests/Fhp/Integration) have been tested most extensively.
+Those banks with a dedicated [integration test](/Tests/Unit/Integration) have been tested most extensively.
 
 If you encounter any problems with your particular bank, please check for open GitHub issues or open a new one.
diff --git a/composer.json b/composer.json
index ec8c9c4a..a5eb6292 100644
--- a/composer.json
+++ b/composer.json
@@ -5,8 +5,8 @@
   "version": "4.0.0",
   "license": "MIT",
   "autoload": {
-    "psr-0": {
-      "Fhp": "lib/"
+    "psr-4": {
+      "Fhp\\": "src/"
     }
   },
   "autoload-dev": {
diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 2a08cf1b..f4e1963a 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -12,7 +12,7 @@
          xsi:noNamespaceSchemaLocation="https://schema.phpunit.de/9.6/phpunit.xsd">
   <coverage processUncoveredFiles="true">
     <include>
-      <directory suffix=".php">./lib/Fhp/</directory>
+      <directory suffix=".php">./src/</directory>
     </include>
   </coverage>
   <testsuites>
diff --git a/lib/Fhp/Action/GetBalance.php b/src/Action/GetBalance.php
similarity index 100%
rename from lib/Fhp/Action/GetBalance.php
rename to src/Action/GetBalance.php
diff --git a/lib/Fhp/Action/GetDepotAufstellung.php b/src/Action/GetDepotAufstellung.php
similarity index 100%
rename from lib/Fhp/Action/GetDepotAufstellung.php
rename to src/Action/GetDepotAufstellung.php
diff --git a/lib/Fhp/Action/GetSEPAAccounts.php b/src/Action/GetSEPAAccounts.php
similarity index 100%
rename from lib/Fhp/Action/GetSEPAAccounts.php
rename to src/Action/GetSEPAAccounts.php
diff --git a/lib/Fhp/Action/GetSEPADirectDebitParameters.php b/src/Action/GetSEPADirectDebitParameters.php
similarity index 100%
rename from lib/Fhp/Action/GetSEPADirectDebitParameters.php
rename to src/Action/GetSEPADirectDebitParameters.php
diff --git a/lib/Fhp/Action/GetStatementOfAccount.php b/src/Action/GetStatementOfAccount.php
similarity index 100%
rename from lib/Fhp/Action/GetStatementOfAccount.php
rename to src/Action/GetStatementOfAccount.php
diff --git a/lib/Fhp/Action/GetStatementOfAccountXML.php b/src/Action/GetStatementOfAccountXML.php
similarity index 100%
rename from lib/Fhp/Action/GetStatementOfAccountXML.php
rename to src/Action/GetStatementOfAccountXML.php
diff --git a/lib/Fhp/Action/SendInternationalCreditTransfer.php b/src/Action/SendInternationalCreditTransfer.php
similarity index 100%
rename from lib/Fhp/Action/SendInternationalCreditTransfer.php
rename to src/Action/SendInternationalCreditTransfer.php
diff --git a/lib/Fhp/Action/SendSEPADirectDebit.php b/src/Action/SendSEPADirectDebit.php
similarity index 100%
rename from lib/Fhp/Action/SendSEPADirectDebit.php
rename to src/Action/SendSEPADirectDebit.php
diff --git a/lib/Fhp/Action/SendSEPARealtimeTransfer.php b/src/Action/SendSEPARealtimeTransfer.php
similarity index 100%
rename from lib/Fhp/Action/SendSEPARealtimeTransfer.php
rename to src/Action/SendSEPARealtimeTransfer.php
diff --git a/lib/Fhp/Action/SendSEPATransfer.php b/src/Action/SendSEPATransfer.php
similarity index 100%
rename from lib/Fhp/Action/SendSEPATransfer.php
rename to src/Action/SendSEPATransfer.php
diff --git a/lib/Fhp/BaseAction.php b/src/BaseAction.php
similarity index 100%
rename from lib/Fhp/BaseAction.php
rename to src/BaseAction.php
diff --git a/lib/Fhp/CAMT/CAMT.php b/src/CAMT/CAMT.php
similarity index 100%
rename from lib/Fhp/CAMT/CAMT.php
rename to src/CAMT/CAMT.php
diff --git a/lib/Fhp/Connection.php b/src/Connection.php
similarity index 100%
rename from lib/Fhp/Connection.php
rename to src/Connection.php
diff --git a/lib/Fhp/CurlException.php b/src/CurlException.php
similarity index 100%
rename from lib/Fhp/CurlException.php
rename to src/CurlException.php
diff --git a/lib/Fhp/FinTs.php b/src/FinTs.php
similarity index 100%
rename from lib/Fhp/FinTs.php
rename to src/FinTs.php
diff --git a/lib/Fhp/MT535/MT535.php b/src/MT535/MT535.php
similarity index 100%
rename from lib/Fhp/MT535/MT535.php
rename to src/MT535/MT535.php
diff --git a/lib/Fhp/MT940/Dialect/PostbankMT940.php b/src/MT940/Dialect/PostbankMT940.php
similarity index 100%
rename from lib/Fhp/MT940/Dialect/PostbankMT940.php
rename to src/MT940/Dialect/PostbankMT940.php
diff --git a/lib/Fhp/MT940/Dialect/SpardaMT940.php b/src/MT940/Dialect/SpardaMT940.php
similarity index 100%
rename from lib/Fhp/MT940/Dialect/SpardaMT940.php
rename to src/MT940/Dialect/SpardaMT940.php
diff --git a/lib/Fhp/MT940/MT940.php b/src/MT940/MT940.php
similarity index 100%
rename from lib/Fhp/MT940/MT940.php
rename to src/MT940/MT940.php
diff --git a/lib/Fhp/MT940/MT940Exception.php b/src/MT940/MT940Exception.php
similarity index 100%
rename from lib/Fhp/MT940/MT940Exception.php
rename to src/MT940/MT940Exception.php
diff --git a/lib/Fhp/Model/Account.php b/src/Model/Account.php
similarity index 100%
rename from lib/Fhp/Model/Account.php
rename to src/Model/Account.php
diff --git a/lib/Fhp/Model/FlickerTan/DataElement.php b/src/Model/FlickerTan/DataElement.php
similarity index 100%
rename from lib/Fhp/Model/FlickerTan/DataElement.php
rename to src/Model/FlickerTan/DataElement.php
diff --git a/lib/Fhp/Model/FlickerTan/StartCode.php b/src/Model/FlickerTan/StartCode.php
similarity index 100%
rename from lib/Fhp/Model/FlickerTan/StartCode.php
rename to src/Model/FlickerTan/StartCode.php
diff --git a/lib/Fhp/Model/FlickerTan/SvgRenderer.php b/src/Model/FlickerTan/SvgRenderer.php
similarity index 100%
rename from lib/Fhp/Model/FlickerTan/SvgRenderer.php
rename to src/Model/FlickerTan/SvgRenderer.php
diff --git a/lib/Fhp/Model/FlickerTan/TanRequestChallengeFlicker.php b/src/Model/FlickerTan/TanRequestChallengeFlicker.php
similarity index 100%
rename from lib/Fhp/Model/FlickerTan/TanRequestChallengeFlicker.php
rename to src/Model/FlickerTan/TanRequestChallengeFlicker.php
diff --git a/lib/Fhp/Model/NoPsd2TanMode.php b/src/Model/NoPsd2TanMode.php
similarity index 100%
rename from lib/Fhp/Model/NoPsd2TanMode.php
rename to src/Model/NoPsd2TanMode.php
diff --git a/lib/Fhp/Model/PollingInfo.php b/src/Model/PollingInfo.php
similarity index 100%
rename from lib/Fhp/Model/PollingInfo.php
rename to src/Model/PollingInfo.php
diff --git a/lib/Fhp/Model/SEPAAccount.php b/src/Model/SEPAAccount.php
similarity index 100%
rename from lib/Fhp/Model/SEPAAccount.php
rename to src/Model/SEPAAccount.php
diff --git a/lib/Fhp/Model/StatementOfAccount/Statement.php b/src/Model/StatementOfAccount/Statement.php
similarity index 100%
rename from lib/Fhp/Model/StatementOfAccount/Statement.php
rename to src/Model/StatementOfAccount/Statement.php
diff --git a/lib/Fhp/Model/StatementOfAccount/StatementOfAccount.php b/src/Model/StatementOfAccount/StatementOfAccount.php
similarity index 100%
rename from lib/Fhp/Model/StatementOfAccount/StatementOfAccount.php
rename to src/Model/StatementOfAccount/StatementOfAccount.php
diff --git a/lib/Fhp/Model/StatementOfAccount/Transaction.php b/src/Model/StatementOfAccount/Transaction.php
similarity index 100%
rename from lib/Fhp/Model/StatementOfAccount/Transaction.php
rename to src/Model/StatementOfAccount/Transaction.php
diff --git a/lib/Fhp/Model/StatementOfHoldings/Holding.php b/src/Model/StatementOfHoldings/Holding.php
similarity index 100%
rename from lib/Fhp/Model/StatementOfHoldings/Holding.php
rename to src/Model/StatementOfHoldings/Holding.php
diff --git a/lib/Fhp/Model/StatementOfHoldings/StatementOfHoldings.php b/src/Model/StatementOfHoldings/StatementOfHoldings.php
similarity index 100%
rename from lib/Fhp/Model/StatementOfHoldings/StatementOfHoldings.php
rename to src/Model/StatementOfHoldings/StatementOfHoldings.php
diff --git a/lib/Fhp/Model/TanMedium.php b/src/Model/TanMedium.php
similarity index 100%
rename from lib/Fhp/Model/TanMedium.php
rename to src/Model/TanMedium.php
diff --git a/lib/Fhp/Model/TanMode.php b/src/Model/TanMode.php
similarity index 100%
rename from lib/Fhp/Model/TanMode.php
rename to src/Model/TanMode.php
diff --git a/lib/Fhp/Model/TanRequest.php b/src/Model/TanRequest.php
similarity index 100%
rename from lib/Fhp/Model/TanRequest.php
rename to src/Model/TanRequest.php
diff --git a/lib/Fhp/Model/TanRequestChallengeImage.php b/src/Model/TanRequestChallengeImage.php
similarity index 100%
rename from lib/Fhp/Model/TanRequestChallengeImage.php
rename to src/Model/TanRequestChallengeImage.php
diff --git a/lib/Fhp/Model/VopConfirmationRequest.php b/src/Model/VopConfirmationRequest.php
similarity index 100%
rename from lib/Fhp/Model/VopConfirmationRequest.php
rename to src/Model/VopConfirmationRequest.php
diff --git a/lib/Fhp/Model/VopConfirmationRequestImpl.php b/src/Model/VopConfirmationRequestImpl.php
similarity index 100%
rename from lib/Fhp/Model/VopConfirmationRequestImpl.php
rename to src/Model/VopConfirmationRequestImpl.php
diff --git a/lib/Fhp/Model/VopPollingInfo.php b/src/Model/VopPollingInfo.php
similarity index 100%
rename from lib/Fhp/Model/VopPollingInfo.php
rename to src/Model/VopPollingInfo.php
diff --git a/lib/Fhp/Model/VopVerificationResult.php b/src/Model/VopVerificationResult.php
similarity index 100%
rename from lib/Fhp/Model/VopVerificationResult.php
rename to src/Model/VopVerificationResult.php
diff --git a/lib/Fhp/Options/Credentials.php b/src/Options/Credentials.php
similarity index 100%
rename from lib/Fhp/Options/Credentials.php
rename to src/Options/Credentials.php
diff --git a/lib/Fhp/Options/FinTsOptions.php b/src/Options/FinTsOptions.php
similarity index 100%
rename from lib/Fhp/Options/FinTsOptions.php
rename to src/Options/FinTsOptions.php
diff --git a/lib/Fhp/Options/SanitizingLogger.php b/src/Options/SanitizingLogger.php
similarity index 100%
rename from lib/Fhp/Options/SanitizingLogger.php
rename to src/Options/SanitizingLogger.php
diff --git a/lib/Fhp/PaginateableAction.php b/src/PaginateableAction.php
similarity index 100%
rename from lib/Fhp/PaginateableAction.php
rename to src/PaginateableAction.php
diff --git a/lib/Fhp/Protocol/ActionIncompleteException.php b/src/Protocol/ActionIncompleteException.php
similarity index 100%
rename from lib/Fhp/Protocol/ActionIncompleteException.php
rename to src/Protocol/ActionIncompleteException.php
diff --git a/lib/Fhp/Protocol/ActionPendingException.php b/src/Protocol/ActionPendingException.php
similarity index 100%
rename from lib/Fhp/Protocol/ActionPendingException.php
rename to src/Protocol/ActionPendingException.php
diff --git a/lib/Fhp/Protocol/BPD.php b/src/Protocol/BPD.php
similarity index 100%
rename from lib/Fhp/Protocol/BPD.php
rename to src/Protocol/BPD.php
diff --git a/lib/Fhp/Protocol/DialogInitialization.php b/src/Protocol/DialogInitialization.php
similarity index 100%
rename from lib/Fhp/Protocol/DialogInitialization.php
rename to src/Protocol/DialogInitialization.php
diff --git a/lib/Fhp/Protocol/GetTanMedia.php b/src/Protocol/GetTanMedia.php
similarity index 100%
rename from lib/Fhp/Protocol/GetTanMedia.php
rename to src/Protocol/GetTanMedia.php
diff --git a/lib/Fhp/Protocol/Message.php b/src/Protocol/Message.php
similarity index 100%
rename from lib/Fhp/Protocol/Message.php
rename to src/Protocol/Message.php
diff --git a/lib/Fhp/Protocol/MessageBuilder.php b/src/Protocol/MessageBuilder.php
similarity index 100%
rename from lib/Fhp/Protocol/MessageBuilder.php
rename to src/Protocol/MessageBuilder.php
diff --git a/lib/Fhp/Protocol/ServerException.php b/src/Protocol/ServerException.php
similarity index 100%
rename from lib/Fhp/Protocol/ServerException.php
rename to src/Protocol/ServerException.php
diff --git a/lib/Fhp/Protocol/TanRequiredException.php b/src/Protocol/TanRequiredException.php
similarity index 100%
rename from lib/Fhp/Protocol/TanRequiredException.php
rename to src/Protocol/TanRequiredException.php
diff --git a/lib/Fhp/Protocol/UPD.php b/src/Protocol/UPD.php
similarity index 100%
rename from lib/Fhp/Protocol/UPD.php
rename to src/Protocol/UPD.php
diff --git a/lib/Fhp/Protocol/UnexpectedResponseException.php b/src/Protocol/UnexpectedResponseException.php
similarity index 100%
rename from lib/Fhp/Protocol/UnexpectedResponseException.php
rename to src/Protocol/UnexpectedResponseException.php
diff --git a/lib/Fhp/Protocol/VopConfirmationRequiredException.php b/src/Protocol/VopConfirmationRequiredException.php
similarity index 100%
rename from lib/Fhp/Protocol/VopConfirmationRequiredException.php
rename to src/Protocol/VopConfirmationRequiredException.php
diff --git a/lib/Fhp/Segment/AUB/HIAUBSv9.php b/src/Segment/AUB/HIAUBSv9.php
similarity index 100%
rename from lib/Fhp/Segment/AUB/HIAUBSv9.php
rename to src/Segment/AUB/HIAUBSv9.php
diff --git a/lib/Fhp/Segment/AUB/HKAUBv9.php b/src/Segment/AUB/HKAUBv9.php
similarity index 100%
rename from lib/Fhp/Segment/AUB/HKAUBv9.php
rename to src/Segment/AUB/HKAUBv9.php
diff --git a/lib/Fhp/Segment/AUB/ParameterAuslandsueberweisungV2.php b/src/Segment/AUB/ParameterAuslandsueberweisungV2.php
similarity index 100%
rename from lib/Fhp/Segment/AUB/ParameterAuslandsueberweisungV2.php
rename to src/Segment/AUB/ParameterAuslandsueberweisungV2.php
diff --git a/lib/Fhp/Segment/AnonymousSegment.php b/src/Segment/AnonymousSegment.php
similarity index 100%
rename from lib/Fhp/Segment/AnonymousSegment.php
rename to src/Segment/AnonymousSegment.php
diff --git a/lib/Fhp/Segment/BME/HIBMESv1.php b/src/Segment/BME/HIBMESv1.php
similarity index 100%
rename from lib/Fhp/Segment/BME/HIBMESv1.php
rename to src/Segment/BME/HIBMESv1.php
diff --git a/lib/Fhp/Segment/BME/HIBMESv2.php b/src/Segment/BME/HIBMESv2.php
similarity index 100%
rename from lib/Fhp/Segment/BME/HIBMESv2.php
rename to src/Segment/BME/HIBMESv2.php
diff --git a/lib/Fhp/Segment/BME/HKBMEv1.php b/src/Segment/BME/HKBMEv1.php
similarity index 100%
rename from lib/Fhp/Segment/BME/HKBMEv1.php
rename to src/Segment/BME/HKBMEv1.php
diff --git a/lib/Fhp/Segment/BME/HKBMEv2.php b/src/Segment/BME/HKBMEv2.php
similarity index 100%
rename from lib/Fhp/Segment/BME/HKBMEv2.php
rename to src/Segment/BME/HKBMEv2.php
diff --git a/lib/Fhp/Segment/BME/ParameterTerminierteSEPAFirmenSammellastschriftEinreichenV1.php b/src/Segment/BME/ParameterTerminierteSEPAFirmenSammellastschriftEinreichenV1.php
similarity index 100%
rename from lib/Fhp/Segment/BME/ParameterTerminierteSEPAFirmenSammellastschriftEinreichenV1.php
rename to src/Segment/BME/ParameterTerminierteSEPAFirmenSammellastschriftEinreichenV1.php
diff --git a/lib/Fhp/Segment/BME/ParameterTerminierteSEPAFirmenSammellastschriftEinreichenV2.php b/src/Segment/BME/ParameterTerminierteSEPAFirmenSammellastschriftEinreichenV2.php
similarity index 100%
rename from lib/Fhp/Segment/BME/ParameterTerminierteSEPAFirmenSammellastschriftEinreichenV2.php
rename to src/Segment/BME/ParameterTerminierteSEPAFirmenSammellastschriftEinreichenV2.php
diff --git a/lib/Fhp/Segment/BSE/HIBSESv1.php b/src/Segment/BSE/HIBSESv1.php
similarity index 100%
rename from lib/Fhp/Segment/BSE/HIBSESv1.php
rename to src/Segment/BSE/HIBSESv1.php
diff --git a/lib/Fhp/Segment/BSE/HIBSESv2.php b/src/Segment/BSE/HIBSESv2.php
similarity index 100%
rename from lib/Fhp/Segment/BSE/HIBSESv2.php
rename to src/Segment/BSE/HIBSESv2.php
diff --git a/lib/Fhp/Segment/BSE/HKBSEv1.php b/src/Segment/BSE/HKBSEv1.php
similarity index 100%
rename from lib/Fhp/Segment/BSE/HKBSEv1.php
rename to src/Segment/BSE/HKBSEv1.php
diff --git a/lib/Fhp/Segment/BSE/HKBSEv2.php b/src/Segment/BSE/HKBSEv2.php
similarity index 100%
rename from lib/Fhp/Segment/BSE/HKBSEv2.php
rename to src/Segment/BSE/HKBSEv2.php
diff --git a/lib/Fhp/Segment/BSE/ParameterTerminierteSEPAFirmenEinzellastschriftEinreichenV1.php b/src/Segment/BSE/ParameterTerminierteSEPAFirmenEinzellastschriftEinreichenV1.php
similarity index 100%
rename from lib/Fhp/Segment/BSE/ParameterTerminierteSEPAFirmenEinzellastschriftEinreichenV1.php
rename to src/Segment/BSE/ParameterTerminierteSEPAFirmenEinzellastschriftEinreichenV1.php
diff --git a/lib/Fhp/Segment/BSE/ParameterTerminierteSEPAFirmenEinzellastschriftEinreichenV2.php b/src/Segment/BSE/ParameterTerminierteSEPAFirmenEinzellastschriftEinreichenV2.php
similarity index 100%
rename from lib/Fhp/Segment/BSE/ParameterTerminierteSEPAFirmenEinzellastschriftEinreichenV2.php
rename to src/Segment/BSE/ParameterTerminierteSEPAFirmenEinzellastschriftEinreichenV2.php
diff --git a/lib/Fhp/Segment/BSE/ParameterTerminierteSEPAFirmenLastschriftEinreichenV2.php b/src/Segment/BSE/ParameterTerminierteSEPAFirmenLastschriftEinreichenV2.php
similarity index 100%
rename from lib/Fhp/Segment/BSE/ParameterTerminierteSEPAFirmenLastschriftEinreichenV2.php
rename to src/Segment/BSE/ParameterTerminierteSEPAFirmenLastschriftEinreichenV2.php
diff --git a/lib/Fhp/Segment/BaseDeg.php b/src/Segment/BaseDeg.php
similarity index 100%
rename from lib/Fhp/Segment/BaseDeg.php
rename to src/Segment/BaseDeg.php
diff --git a/lib/Fhp/Segment/BaseDescriptor.php b/src/Segment/BaseDescriptor.php
similarity index 100%
rename from lib/Fhp/Segment/BaseDescriptor.php
rename to src/Segment/BaseDescriptor.php
diff --git a/lib/Fhp/Segment/BaseGeschaeftsvorfallparameter.php b/src/Segment/BaseGeschaeftsvorfallparameter.php
similarity index 100%
rename from lib/Fhp/Segment/BaseGeschaeftsvorfallparameter.php
rename to src/Segment/BaseGeschaeftsvorfallparameter.php
diff --git a/lib/Fhp/Segment/BaseGeschaeftsvorfallparameterOld.php b/src/Segment/BaseGeschaeftsvorfallparameterOld.php
similarity index 100%
rename from lib/Fhp/Segment/BaseGeschaeftsvorfallparameterOld.php
rename to src/Segment/BaseGeschaeftsvorfallparameterOld.php
diff --git a/lib/Fhp/Segment/BaseSegment.php b/src/Segment/BaseSegment.php
similarity index 100%
rename from lib/Fhp/Segment/BaseSegment.php
rename to src/Segment/BaseSegment.php
diff --git a/lib/Fhp/Segment/CAZ/GebuchteCamtUmsaetze.php b/src/Segment/CAZ/GebuchteCamtUmsaetze.php
similarity index 100%
rename from lib/Fhp/Segment/CAZ/GebuchteCamtUmsaetze.php
rename to src/Segment/CAZ/GebuchteCamtUmsaetze.php
diff --git a/lib/Fhp/Segment/CAZ/HICAZSv1.php b/src/Segment/CAZ/HICAZSv1.php
similarity index 100%
rename from lib/Fhp/Segment/CAZ/HICAZSv1.php
rename to src/Segment/CAZ/HICAZSv1.php
diff --git a/lib/Fhp/Segment/CAZ/HICAZv1.php b/src/Segment/CAZ/HICAZv1.php
similarity index 100%
rename from lib/Fhp/Segment/CAZ/HICAZv1.php
rename to src/Segment/CAZ/HICAZv1.php
diff --git a/lib/Fhp/Segment/CAZ/HKCAZv1.php b/src/Segment/CAZ/HKCAZv1.php
similarity index 100%
rename from lib/Fhp/Segment/CAZ/HKCAZv1.php
rename to src/Segment/CAZ/HKCAZv1.php
diff --git a/lib/Fhp/Segment/CAZ/ParameterKontoumsaetzeCamt.php b/src/Segment/CAZ/ParameterKontoumsaetzeCamt.php
similarity index 100%
rename from lib/Fhp/Segment/CAZ/ParameterKontoumsaetzeCamt.php
rename to src/Segment/CAZ/ParameterKontoumsaetzeCamt.php
diff --git a/lib/Fhp/Segment/CAZ/UnterstuetzteCamtMessages.php b/src/Segment/CAZ/UnterstuetzteCamtMessages.php
similarity index 100%
rename from lib/Fhp/Segment/CAZ/UnterstuetzteCamtMessages.php
rename to src/Segment/CAZ/UnterstuetzteCamtMessages.php
diff --git a/lib/Fhp/Segment/CCM/HICCMSv1.php b/src/Segment/CCM/HICCMSv1.php
similarity index 100%
rename from lib/Fhp/Segment/CCM/HICCMSv1.php
rename to src/Segment/CCM/HICCMSv1.php
diff --git a/lib/Fhp/Segment/CCM/HKCCMv1.php b/src/Segment/CCM/HKCCMv1.php
similarity index 100%
rename from lib/Fhp/Segment/CCM/HKCCMv1.php
rename to src/Segment/CCM/HKCCMv1.php
diff --git a/lib/Fhp/Segment/CCM/ParameterSEPASammelueberweisungV1.php b/src/Segment/CCM/ParameterSEPASammelueberweisungV1.php
similarity index 100%
rename from lib/Fhp/Segment/CCM/ParameterSEPASammelueberweisungV1.php
rename to src/Segment/CCM/ParameterSEPASammelueberweisungV1.php
diff --git a/lib/Fhp/Segment/CCS/HICCSSv1.php b/src/Segment/CCS/HICCSSv1.php
similarity index 100%
rename from lib/Fhp/Segment/CCS/HICCSSv1.php
rename to src/Segment/CCS/HICCSSv1.php
diff --git a/lib/Fhp/Segment/CCS/HKCCSv1.php b/src/Segment/CCS/HKCCSv1.php
similarity index 100%
rename from lib/Fhp/Segment/CCS/HKCCSv1.php
rename to src/Segment/CCS/HKCCSv1.php
diff --git a/lib/Fhp/Segment/CME/HICMESv1.php b/src/Segment/CME/HICMESv1.php
similarity index 100%
rename from lib/Fhp/Segment/CME/HICMESv1.php
rename to src/Segment/CME/HICMESv1.php
diff --git a/lib/Fhp/Segment/CME/HICMEv1.php b/src/Segment/CME/HICMEv1.php
similarity index 100%
rename from lib/Fhp/Segment/CME/HICMEv1.php
rename to src/Segment/CME/HICMEv1.php
diff --git a/lib/Fhp/Segment/CME/HKCMEv1.php b/src/Segment/CME/HKCMEv1.php
similarity index 100%
rename from lib/Fhp/Segment/CME/HKCMEv1.php
rename to src/Segment/CME/HKCMEv1.php
diff --git a/lib/Fhp/Segment/CME/ParameterTerminierteSEPASammelueberweisungEinreichenV1.php b/src/Segment/CME/ParameterTerminierteSEPASammelueberweisungEinreichenV1.php
similarity index 100%
rename from lib/Fhp/Segment/CME/ParameterTerminierteSEPASammelueberweisungEinreichenV1.php
rename to src/Segment/CME/ParameterTerminierteSEPASammelueberweisungEinreichenV1.php
diff --git a/lib/Fhp/Segment/CSE/HICSESv1.php b/src/Segment/CSE/HICSESv1.php
similarity index 100%
rename from lib/Fhp/Segment/CSE/HICSESv1.php
rename to src/Segment/CSE/HICSESv1.php
diff --git a/lib/Fhp/Segment/CSE/HICSEv1.php b/src/Segment/CSE/HICSEv1.php
similarity index 100%
rename from lib/Fhp/Segment/CSE/HICSEv1.php
rename to src/Segment/CSE/HICSEv1.php
diff --git a/lib/Fhp/Segment/CSE/HKCSEv1.php b/src/Segment/CSE/HKCSEv1.php
similarity index 100%
rename from lib/Fhp/Segment/CSE/HKCSEv1.php
rename to src/Segment/CSE/HKCSEv1.php
diff --git a/lib/Fhp/Segment/CSE/ParameterTerminierteSEPAUeberweisungEinreichenV1.php b/src/Segment/CSE/ParameterTerminierteSEPAUeberweisungEinreichenV1.php
similarity index 100%
rename from lib/Fhp/Segment/CSE/ParameterTerminierteSEPAUeberweisungEinreichenV1.php
rename to src/Segment/CSE/ParameterTerminierteSEPAUeberweisungEinreichenV1.php
diff --git a/lib/Fhp/Segment/Common/AccountInfo.php b/src/Segment/Common/AccountInfo.php
similarity index 100%
rename from lib/Fhp/Segment/Common/AccountInfo.php
rename to src/Segment/Common/AccountInfo.php
diff --git a/lib/Fhp/Segment/Common/Btg.php b/src/Segment/Common/Btg.php
similarity index 100%
rename from lib/Fhp/Segment/Common/Btg.php
rename to src/Segment/Common/Btg.php
diff --git a/lib/Fhp/Segment/Common/Kik.php b/src/Segment/Common/Kik.php
similarity index 100%
rename from lib/Fhp/Segment/Common/Kik.php
rename to src/Segment/Common/Kik.php
diff --git a/lib/Fhp/Segment/Common/Kti.php b/src/Segment/Common/Kti.php
similarity index 100%
rename from lib/Fhp/Segment/Common/Kti.php
rename to src/Segment/Common/Kti.php
diff --git a/lib/Fhp/Segment/Common/Kto.php b/src/Segment/Common/Kto.php
similarity index 100%
rename from lib/Fhp/Segment/Common/Kto.php
rename to src/Segment/Common/Kto.php
diff --git a/lib/Fhp/Segment/Common/KtvV3.php b/src/Segment/Common/KtvV3.php
similarity index 100%
rename from lib/Fhp/Segment/Common/KtvV3.php
rename to src/Segment/Common/KtvV3.php
diff --git a/lib/Fhp/Segment/Common/Ktz.php b/src/Segment/Common/Ktz.php
similarity index 100%
rename from lib/Fhp/Segment/Common/Ktz.php
rename to src/Segment/Common/Ktz.php
diff --git a/lib/Fhp/Segment/Common/Kursqualitaet.php b/src/Segment/Common/Kursqualitaet.php
similarity index 100%
rename from lib/Fhp/Segment/Common/Kursqualitaet.php
rename to src/Segment/Common/Kursqualitaet.php
diff --git a/lib/Fhp/Segment/Common/Sdo.php b/src/Segment/Common/Sdo.php
similarity index 100%
rename from lib/Fhp/Segment/Common/Sdo.php
rename to src/Segment/Common/Sdo.php
diff --git a/lib/Fhp/Segment/Common/Tsp.php b/src/Segment/Common/Tsp.php
similarity index 100%
rename from lib/Fhp/Segment/Common/Tsp.php
rename to src/Segment/Common/Tsp.php
diff --git a/lib/Fhp/Segment/DME/HIDMESv1.php b/src/Segment/DME/HIDMESv1.php
similarity index 100%
rename from lib/Fhp/Segment/DME/HIDMESv1.php
rename to src/Segment/DME/HIDMESv1.php
diff --git a/lib/Fhp/Segment/DME/HIDMESv2.php b/src/Segment/DME/HIDMESv2.php
similarity index 100%
rename from lib/Fhp/Segment/DME/HIDMESv2.php
rename to src/Segment/DME/HIDMESv2.php
diff --git a/lib/Fhp/Segment/DME/HKDMEv1.php b/src/Segment/DME/HKDMEv1.php
similarity index 100%
rename from lib/Fhp/Segment/DME/HKDMEv1.php
rename to src/Segment/DME/HKDMEv1.php
diff --git a/lib/Fhp/Segment/DME/HKDMEv2.php b/src/Segment/DME/HKDMEv2.php
similarity index 100%
rename from lib/Fhp/Segment/DME/HKDMEv2.php
rename to src/Segment/DME/HKDMEv2.php
diff --git a/lib/Fhp/Segment/DME/ParameterTerminierteSEPASammellastschriftEinreichenV1.php b/src/Segment/DME/ParameterTerminierteSEPASammellastschriftEinreichenV1.php
similarity index 100%
rename from lib/Fhp/Segment/DME/ParameterTerminierteSEPASammellastschriftEinreichenV1.php
rename to src/Segment/DME/ParameterTerminierteSEPASammellastschriftEinreichenV1.php
diff --git a/lib/Fhp/Segment/DME/ParameterTerminierteSEPASammellastschriftEinreichenV2.php b/src/Segment/DME/ParameterTerminierteSEPASammellastschriftEinreichenV2.php
similarity index 100%
rename from lib/Fhp/Segment/DME/ParameterTerminierteSEPASammellastschriftEinreichenV2.php
rename to src/Segment/DME/ParameterTerminierteSEPASammellastschriftEinreichenV2.php
diff --git a/lib/Fhp/Segment/DSE/HIDSESv1.php b/src/Segment/DSE/HIDSESv1.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/HIDSESv1.php
rename to src/Segment/DSE/HIDSESv1.php
diff --git a/lib/Fhp/Segment/DSE/HIDSESv2.php b/src/Segment/DSE/HIDSESv2.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/HIDSESv2.php
rename to src/Segment/DSE/HIDSESv2.php
diff --git a/lib/Fhp/Segment/DSE/HIDXES.php b/src/Segment/DSE/HIDXES.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/HIDXES.php
rename to src/Segment/DSE/HIDXES.php
diff --git a/lib/Fhp/Segment/DSE/HKDSEv1.php b/src/Segment/DSE/HKDSEv1.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/HKDSEv1.php
rename to src/Segment/DSE/HKDSEv1.php
diff --git a/lib/Fhp/Segment/DSE/HKDSEv2.php b/src/Segment/DSE/HKDSEv2.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/HKDSEv2.php
rename to src/Segment/DSE/HKDSEv2.php
diff --git a/lib/Fhp/Segment/DSE/MinimaleVorlaufzeitSEPALastschrift.php b/src/Segment/DSE/MinimaleVorlaufzeitSEPALastschrift.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/MinimaleVorlaufzeitSEPALastschrift.php
rename to src/Segment/DSE/MinimaleVorlaufzeitSEPALastschrift.php
diff --git a/lib/Fhp/Segment/DSE/ParameterTerminierteSEPAEinzellastschriftEinreichenV1.php b/src/Segment/DSE/ParameterTerminierteSEPAEinzellastschriftEinreichenV1.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/ParameterTerminierteSEPAEinzellastschriftEinreichenV1.php
rename to src/Segment/DSE/ParameterTerminierteSEPAEinzellastschriftEinreichenV1.php
diff --git a/lib/Fhp/Segment/DSE/ParameterTerminierteSEPAEinzellastschriftEinreichenV2.php b/src/Segment/DSE/ParameterTerminierteSEPAEinzellastschriftEinreichenV2.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/ParameterTerminierteSEPAEinzellastschriftEinreichenV2.php
rename to src/Segment/DSE/ParameterTerminierteSEPAEinzellastschriftEinreichenV2.php
diff --git a/lib/Fhp/Segment/DSE/ParameterTerminierteSEPALastschriftEinreichenV2.php b/src/Segment/DSE/ParameterTerminierteSEPALastschriftEinreichenV2.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/ParameterTerminierteSEPALastschriftEinreichenV2.php
rename to src/Segment/DSE/ParameterTerminierteSEPALastschriftEinreichenV2.php
diff --git a/lib/Fhp/Segment/DSE/SEPADirectDebitMinimalLeadTimeProvider.php b/src/Segment/DSE/SEPADirectDebitMinimalLeadTimeProvider.php
similarity index 100%
rename from lib/Fhp/Segment/DSE/SEPADirectDebitMinimalLeadTimeProvider.php
rename to src/Segment/DSE/SEPADirectDebitMinimalLeadTimeProvider.php
diff --git a/lib/Fhp/Segment/DegDescriptor.php b/src/Segment/DegDescriptor.php
similarity index 100%
rename from lib/Fhp/Segment/DegDescriptor.php
rename to src/Segment/DegDescriptor.php
diff --git a/lib/Fhp/Segment/ElementDescriptor.php b/src/Segment/ElementDescriptor.php
similarity index 100%
rename from lib/Fhp/Segment/ElementDescriptor.php
rename to src/Segment/ElementDescriptor.php
diff --git a/lib/Fhp/Segment/HIBPA/HIBPAv3.php b/src/Segment/HIBPA/HIBPAv3.php
similarity index 100%
rename from lib/Fhp/Segment/HIBPA/HIBPAv3.php
rename to src/Segment/HIBPA/HIBPAv3.php
diff --git a/lib/Fhp/Segment/HIBPA/UnterstuetzteHbciVersionenV2.php b/src/Segment/HIBPA/UnterstuetzteHbciVersionenV2.php
similarity index 100%
rename from lib/Fhp/Segment/HIBPA/UnterstuetzteHbciVersionenV2.php
rename to src/Segment/HIBPA/UnterstuetzteHbciVersionenV2.php
diff --git a/lib/Fhp/Segment/HIBPA/UnterstuetzteSprachenV2.php b/src/Segment/HIBPA/UnterstuetzteSprachenV2.php
similarity index 100%
rename from lib/Fhp/Segment/HIBPA/UnterstuetzteSprachenV2.php
rename to src/Segment/HIBPA/UnterstuetzteSprachenV2.php
diff --git a/lib/Fhp/Segment/HIPINS/GeschaeftsvorfallspezifischePinTanInformationen.php b/src/Segment/HIPINS/GeschaeftsvorfallspezifischePinTanInformationen.php
similarity index 100%
rename from lib/Fhp/Segment/HIPINS/GeschaeftsvorfallspezifischePinTanInformationen.php
rename to src/Segment/HIPINS/GeschaeftsvorfallspezifischePinTanInformationen.php
diff --git a/lib/Fhp/Segment/HIPINS/HIPINSv1.php b/src/Segment/HIPINS/HIPINSv1.php
similarity index 100%
rename from lib/Fhp/Segment/HIPINS/HIPINSv1.php
rename to src/Segment/HIPINS/HIPINSv1.php
diff --git a/lib/Fhp/Segment/HIPINS/ParameterPinTanSpezifischeInformationen.php b/src/Segment/HIPINS/ParameterPinTanSpezifischeInformationen.php
similarity index 100%
rename from lib/Fhp/Segment/HIPINS/ParameterPinTanSpezifischeInformationen.php
rename to src/Segment/HIPINS/ParameterPinTanSpezifischeInformationen.php
diff --git a/lib/Fhp/Segment/HIRMG/HIRMGv2.php b/src/Segment/HIRMG/HIRMGv2.php
similarity index 100%
rename from lib/Fhp/Segment/HIRMG/HIRMGv2.php
rename to src/Segment/HIRMG/HIRMGv2.php
diff --git a/lib/Fhp/Segment/HIRMS/FindRueckmeldungTrait.php b/src/Segment/HIRMS/FindRueckmeldungTrait.php
similarity index 100%
rename from lib/Fhp/Segment/HIRMS/FindRueckmeldungTrait.php
rename to src/Segment/HIRMS/FindRueckmeldungTrait.php
diff --git a/lib/Fhp/Segment/HIRMS/HIRMSv2.php b/src/Segment/HIRMS/HIRMSv2.php
similarity index 100%
rename from lib/Fhp/Segment/HIRMS/HIRMSv2.php
rename to src/Segment/HIRMS/HIRMSv2.php
diff --git a/lib/Fhp/Segment/HIRMS/Rueckmeldung.php b/src/Segment/HIRMS/Rueckmeldung.php
similarity index 100%
rename from lib/Fhp/Segment/HIRMS/Rueckmeldung.php
rename to src/Segment/HIRMS/Rueckmeldung.php
diff --git a/lib/Fhp/Segment/HIRMS/RueckmeldungContainer.php b/src/Segment/HIRMS/RueckmeldungContainer.php
similarity index 100%
rename from lib/Fhp/Segment/HIRMS/RueckmeldungContainer.php
rename to src/Segment/HIRMS/RueckmeldungContainer.php
diff --git a/lib/Fhp/Segment/HIRMS/Rueckmeldungscode.php b/src/Segment/HIRMS/Rueckmeldungscode.php
similarity index 100%
rename from lib/Fhp/Segment/HIRMS/Rueckmeldungscode.php
rename to src/Segment/HIRMS/Rueckmeldungscode.php
diff --git a/lib/Fhp/Segment/HISYN/HISYNv4.php b/src/Segment/HISYN/HISYNv4.php
similarity index 100%
rename from lib/Fhp/Segment/HISYN/HISYNv4.php
rename to src/Segment/HISYN/HISYNv4.php
diff --git a/lib/Fhp/Segment/HIUPA/HIUPAv4.php b/src/Segment/HIUPA/HIUPAv4.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPA/HIUPAv4.php
rename to src/Segment/HIUPA/HIUPAv4.php
diff --git a/lib/Fhp/Segment/HIUPD/ErlaubteGeschaeftsvorfaelle.php b/src/Segment/HIUPD/ErlaubteGeschaeftsvorfaelle.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPD/ErlaubteGeschaeftsvorfaelle.php
rename to src/Segment/HIUPD/ErlaubteGeschaeftsvorfaelle.php
diff --git a/lib/Fhp/Segment/HIUPD/ErlaubteGeschaeftsvorfaelleV1.php b/src/Segment/HIUPD/ErlaubteGeschaeftsvorfaelleV1.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPD/ErlaubteGeschaeftsvorfaelleV1.php
rename to src/Segment/HIUPD/ErlaubteGeschaeftsvorfaelleV1.php
diff --git a/lib/Fhp/Segment/HIUPD/ErlaubteGeschaeftsvorfaelleV2.php b/src/Segment/HIUPD/ErlaubteGeschaeftsvorfaelleV2.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPD/ErlaubteGeschaeftsvorfaelleV2.php
rename to src/Segment/HIUPD/ErlaubteGeschaeftsvorfaelleV2.php
diff --git a/lib/Fhp/Segment/HIUPD/HIUPD.php b/src/Segment/HIUPD/HIUPD.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPD/HIUPD.php
rename to src/Segment/HIUPD/HIUPD.php
diff --git a/lib/Fhp/Segment/HIUPD/HIUPDv4.php b/src/Segment/HIUPD/HIUPDv4.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPD/HIUPDv4.php
rename to src/Segment/HIUPD/HIUPDv4.php
diff --git a/lib/Fhp/Segment/HIUPD/HIUPDv6.php b/src/Segment/HIUPD/HIUPDv6.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPD/HIUPDv6.php
rename to src/Segment/HIUPD/HIUPDv6.php
diff --git a/lib/Fhp/Segment/HIUPD/KontolimitV1.php b/src/Segment/HIUPD/KontolimitV1.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPD/KontolimitV1.php
rename to src/Segment/HIUPD/KontolimitV1.php
diff --git a/lib/Fhp/Segment/HIUPD/KontolimitV2.php b/src/Segment/HIUPD/KontolimitV2.php
similarity index 100%
rename from lib/Fhp/Segment/HIUPD/KontolimitV2.php
rename to src/Segment/HIUPD/KontolimitV2.php
diff --git a/lib/Fhp/Segment/HKEND/HKENDv1.php b/src/Segment/HKEND/HKENDv1.php
similarity index 100%
rename from lib/Fhp/Segment/HKEND/HKENDv1.php
rename to src/Segment/HKEND/HKENDv1.php
diff --git a/lib/Fhp/Segment/HKIDN/HKIDNv2.php b/src/Segment/HKIDN/HKIDNv2.php
similarity index 100%
rename from lib/Fhp/Segment/HKIDN/HKIDNv2.php
rename to src/Segment/HKIDN/HKIDNv2.php
diff --git a/lib/Fhp/Segment/HKSYN/HKSYNv3.php b/src/Segment/HKSYN/HKSYNv3.php
similarity index 100%
rename from lib/Fhp/Segment/HKSYN/HKSYNv3.php
rename to src/Segment/HKSYN/HKSYNv3.php
diff --git a/lib/Fhp/Segment/HKVVB/HKVVBv3.php b/src/Segment/HKVVB/HKVVBv3.php
similarity index 100%
rename from lib/Fhp/Segment/HKVVB/HKVVBv3.php
rename to src/Segment/HKVVB/HKVVBv3.php
diff --git a/lib/Fhp/Segment/HNHBK/BezugsnachrichtV1.php b/src/Segment/HNHBK/BezugsnachrichtV1.php
similarity index 100%
rename from lib/Fhp/Segment/HNHBK/BezugsnachrichtV1.php
rename to src/Segment/HNHBK/BezugsnachrichtV1.php
diff --git a/lib/Fhp/Segment/HNHBK/HNHBKv3.php b/src/Segment/HNHBK/HNHBKv3.php
similarity index 100%
rename from lib/Fhp/Segment/HNHBK/HNHBKv3.php
rename to src/Segment/HNHBK/HNHBKv3.php
diff --git a/lib/Fhp/Segment/HNHBS/HNHBSv1.php b/src/Segment/HNHBS/HNHBSv1.php
similarity index 100%
rename from lib/Fhp/Segment/HNHBS/HNHBSv1.php
rename to src/Segment/HNHBS/HNHBSv1.php
diff --git a/lib/Fhp/Segment/HNSHA/BenutzerdefinierteSignaturV1.php b/src/Segment/HNSHA/BenutzerdefinierteSignaturV1.php
similarity index 100%
rename from lib/Fhp/Segment/HNSHA/BenutzerdefinierteSignaturV1.php
rename to src/Segment/HNSHA/BenutzerdefinierteSignaturV1.php
diff --git a/lib/Fhp/Segment/HNSHA/HNSHAv2.php b/src/Segment/HNSHA/HNSHAv2.php
similarity index 100%
rename from lib/Fhp/Segment/HNSHA/HNSHAv2.php
rename to src/Segment/HNSHA/HNSHAv2.php
diff --git a/lib/Fhp/Segment/HNSHK/HNSHKv4.php b/src/Segment/HNSHK/HNSHKv4.php
similarity index 100%
rename from lib/Fhp/Segment/HNSHK/HNSHKv4.php
rename to src/Segment/HNSHK/HNSHKv4.php
diff --git a/lib/Fhp/Segment/HNSHK/HashalgorithmusV2.php b/src/Segment/HNSHK/HashalgorithmusV2.php
similarity index 100%
rename from lib/Fhp/Segment/HNSHK/HashalgorithmusV2.php
rename to src/Segment/HNSHK/HashalgorithmusV2.php
diff --git a/lib/Fhp/Segment/HNSHK/SignaturalgorithmusV2.php b/src/Segment/HNSHK/SignaturalgorithmusV2.php
similarity index 100%
rename from lib/Fhp/Segment/HNSHK/SignaturalgorithmusV2.php
rename to src/Segment/HNSHK/SignaturalgorithmusV2.php
diff --git a/lib/Fhp/Segment/HNVSD/HNVSDv1.php b/src/Segment/HNVSD/HNVSDv1.php
similarity index 100%
rename from lib/Fhp/Segment/HNVSD/HNVSDv1.php
rename to src/Segment/HNVSD/HNVSDv1.php
diff --git a/lib/Fhp/Segment/HNVSK/HNVSKv3.php b/src/Segment/HNVSK/HNVSKv3.php
similarity index 100%
rename from lib/Fhp/Segment/HNVSK/HNVSKv3.php
rename to src/Segment/HNVSK/HNVSKv3.php
diff --git a/lib/Fhp/Segment/HNVSK/SchluesselnameV3.php b/src/Segment/HNVSK/SchluesselnameV3.php
similarity index 100%
rename from lib/Fhp/Segment/HNVSK/SchluesselnameV3.php
rename to src/Segment/HNVSK/SchluesselnameV3.php
diff --git a/lib/Fhp/Segment/HNVSK/SicherheitsdatumUndUhrzeitV2.php b/src/Segment/HNVSK/SicherheitsdatumUndUhrzeitV2.php
similarity index 100%
rename from lib/Fhp/Segment/HNVSK/SicherheitsdatumUndUhrzeitV2.php
rename to src/Segment/HNVSK/SicherheitsdatumUndUhrzeitV2.php
diff --git a/lib/Fhp/Segment/HNVSK/SicherheitsidentifikationDetailsV2.php b/src/Segment/HNVSK/SicherheitsidentifikationDetailsV2.php
similarity index 100%
rename from lib/Fhp/Segment/HNVSK/SicherheitsidentifikationDetailsV2.php
rename to src/Segment/HNVSK/SicherheitsidentifikationDetailsV2.php
diff --git a/lib/Fhp/Segment/HNVSK/SicherheitsprofilV1.php b/src/Segment/HNVSK/SicherheitsprofilV1.php
similarity index 100%
rename from lib/Fhp/Segment/HNVSK/SicherheitsprofilV1.php
rename to src/Segment/HNVSK/SicherheitsprofilV1.php
diff --git a/lib/Fhp/Segment/HNVSK/VerschluesselungsalgorithmusV2.php b/src/Segment/HNVSK/VerschluesselungsalgorithmusV2.php
similarity index 100%
rename from lib/Fhp/Segment/HNVSK/VerschluesselungsalgorithmusV2.php
rename to src/Segment/HNVSK/VerschluesselungsalgorithmusV2.php
diff --git a/lib/Fhp/Segment/HNVSK/ZertifikatV2.php b/src/Segment/HNVSK/ZertifikatV2.php
similarity index 100%
rename from lib/Fhp/Segment/HNVSK/ZertifikatV2.php
rename to src/Segment/HNVSK/ZertifikatV2.php
diff --git a/lib/Fhp/Segment/IPZ/HIIPZSv1.php b/src/Segment/IPZ/HIIPZSv1.php
similarity index 100%
rename from lib/Fhp/Segment/IPZ/HIIPZSv1.php
rename to src/Segment/IPZ/HIIPZSv1.php
diff --git a/lib/Fhp/Segment/IPZ/HIIPZSv2.php b/src/Segment/IPZ/HIIPZSv2.php
similarity index 100%
rename from lib/Fhp/Segment/IPZ/HIIPZSv2.php
rename to src/Segment/IPZ/HIIPZSv2.php
diff --git a/lib/Fhp/Segment/IPZ/HIIPZv1.php b/src/Segment/IPZ/HIIPZv1.php
similarity index 100%
rename from lib/Fhp/Segment/IPZ/HIIPZv1.php
rename to src/Segment/IPZ/HIIPZv1.php
diff --git a/lib/Fhp/Segment/IPZ/HIIPZv2.php b/src/Segment/IPZ/HIIPZv2.php
similarity index 100%
rename from lib/Fhp/Segment/IPZ/HIIPZv2.php
rename to src/Segment/IPZ/HIIPZv2.php
diff --git a/lib/Fhp/Segment/IPZ/HKIPZv1.php b/src/Segment/IPZ/HKIPZv1.php
similarity index 100%
rename from lib/Fhp/Segment/IPZ/HKIPZv1.php
rename to src/Segment/IPZ/HKIPZv1.php
diff --git a/lib/Fhp/Segment/IPZ/HKIPZv2.php b/src/Segment/IPZ/HKIPZv2.php
similarity index 100%
rename from lib/Fhp/Segment/IPZ/HKIPZv2.php
rename to src/Segment/IPZ/HKIPZv2.php
diff --git a/lib/Fhp/Segment/IPZ/ParameterSEPAInstantPaymentZahlungV1.php b/src/Segment/IPZ/ParameterSEPAInstantPaymentZahlungV1.php
similarity index 100%
rename from lib/Fhp/Segment/IPZ/ParameterSEPAInstantPaymentZahlungV1.php
rename to src/Segment/IPZ/ParameterSEPAInstantPaymentZahlungV1.php
diff --git a/lib/Fhp/Segment/IPZ/ParameterSEPAInstantPaymentZahlungV2.php b/src/Segment/IPZ/ParameterSEPAInstantPaymentZahlungV2.php
similarity index 100%
rename from lib/Fhp/Segment/IPZ/ParameterSEPAInstantPaymentZahlungV2.php
rename to src/Segment/IPZ/ParameterSEPAInstantPaymentZahlungV2.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZ.php b/src/Segment/KAZ/HIKAZ.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZ.php
rename to src/Segment/KAZ/HIKAZ.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZS.php b/src/Segment/KAZ/HIKAZS.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZS.php
rename to src/Segment/KAZ/HIKAZS.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZSv4.php b/src/Segment/KAZ/HIKAZSv4.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZSv4.php
rename to src/Segment/KAZ/HIKAZSv4.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZSv5.php b/src/Segment/KAZ/HIKAZSv5.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZSv5.php
rename to src/Segment/KAZ/HIKAZSv5.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZSv6.php b/src/Segment/KAZ/HIKAZSv6.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZSv6.php
rename to src/Segment/KAZ/HIKAZSv6.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZSv7.php b/src/Segment/KAZ/HIKAZSv7.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZSv7.php
rename to src/Segment/KAZ/HIKAZSv7.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZv4.php b/src/Segment/KAZ/HIKAZv4.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZv4.php
rename to src/Segment/KAZ/HIKAZv4.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZv5.php b/src/Segment/KAZ/HIKAZv5.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZv5.php
rename to src/Segment/KAZ/HIKAZv5.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZv6.php b/src/Segment/KAZ/HIKAZv6.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZv6.php
rename to src/Segment/KAZ/HIKAZv6.php
diff --git a/lib/Fhp/Segment/KAZ/HIKAZv7.php b/src/Segment/KAZ/HIKAZv7.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HIKAZv7.php
rename to src/Segment/KAZ/HIKAZv7.php
diff --git a/lib/Fhp/Segment/KAZ/HKKAZv4.php b/src/Segment/KAZ/HKKAZv4.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HKKAZv4.php
rename to src/Segment/KAZ/HKKAZv4.php
diff --git a/lib/Fhp/Segment/KAZ/HKKAZv5.php b/src/Segment/KAZ/HKKAZv5.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HKKAZv5.php
rename to src/Segment/KAZ/HKKAZv5.php
diff --git a/lib/Fhp/Segment/KAZ/HKKAZv6.php b/src/Segment/KAZ/HKKAZv6.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HKKAZv6.php
rename to src/Segment/KAZ/HKKAZv6.php
diff --git a/lib/Fhp/Segment/KAZ/HKKAZv7.php b/src/Segment/KAZ/HKKAZv7.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/HKKAZv7.php
rename to src/Segment/KAZ/HKKAZv7.php
diff --git a/lib/Fhp/Segment/KAZ/ParameterKontoumsaetze.php b/src/Segment/KAZ/ParameterKontoumsaetze.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/ParameterKontoumsaetze.php
rename to src/Segment/KAZ/ParameterKontoumsaetze.php
diff --git a/lib/Fhp/Segment/KAZ/ParameterKontoumsaetzeV1.php b/src/Segment/KAZ/ParameterKontoumsaetzeV1.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/ParameterKontoumsaetzeV1.php
rename to src/Segment/KAZ/ParameterKontoumsaetzeV1.php
diff --git a/lib/Fhp/Segment/KAZ/ParameterKontoumsaetzeV2.php b/src/Segment/KAZ/ParameterKontoumsaetzeV2.php
similarity index 100%
rename from lib/Fhp/Segment/KAZ/ParameterKontoumsaetzeV2.php
rename to src/Segment/KAZ/ParameterKontoumsaetzeV2.php
diff --git a/lib/Fhp/Segment/Paginateable.php b/src/Segment/Paginateable.php
similarity index 100%
rename from lib/Fhp/Segment/Paginateable.php
rename to src/Segment/Paginateable.php
diff --git a/lib/Fhp/Segment/SAL/HISAL.php b/src/Segment/SAL/HISAL.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISAL.php
rename to src/Segment/SAL/HISAL.php
diff --git a/lib/Fhp/Segment/SAL/HISALSv4.php b/src/Segment/SAL/HISALSv4.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISALSv4.php
rename to src/Segment/SAL/HISALSv4.php
diff --git a/lib/Fhp/Segment/SAL/HISALSv5.php b/src/Segment/SAL/HISALSv5.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISALSv5.php
rename to src/Segment/SAL/HISALSv5.php
diff --git a/lib/Fhp/Segment/SAL/HISALSv6.php b/src/Segment/SAL/HISALSv6.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISALSv6.php
rename to src/Segment/SAL/HISALSv6.php
diff --git a/lib/Fhp/Segment/SAL/HISALSv7.php b/src/Segment/SAL/HISALSv7.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISALSv7.php
rename to src/Segment/SAL/HISALSv7.php
diff --git a/lib/Fhp/Segment/SAL/HISALv4.php b/src/Segment/SAL/HISALv4.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISALv4.php
rename to src/Segment/SAL/HISALv4.php
diff --git a/lib/Fhp/Segment/SAL/HISALv5.php b/src/Segment/SAL/HISALv5.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISALv5.php
rename to src/Segment/SAL/HISALv5.php
diff --git a/lib/Fhp/Segment/SAL/HISALv6.php b/src/Segment/SAL/HISALv6.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISALv6.php
rename to src/Segment/SAL/HISALv6.php
diff --git a/lib/Fhp/Segment/SAL/HISALv7.php b/src/Segment/SAL/HISALv7.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HISALv7.php
rename to src/Segment/SAL/HISALv7.php
diff --git a/lib/Fhp/Segment/SAL/HKSALv4.php b/src/Segment/SAL/HKSALv4.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HKSALv4.php
rename to src/Segment/SAL/HKSALv4.php
diff --git a/lib/Fhp/Segment/SAL/HKSALv5.php b/src/Segment/SAL/HKSALv5.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HKSALv5.php
rename to src/Segment/SAL/HKSALv5.php
diff --git a/lib/Fhp/Segment/SAL/HKSALv6.php b/src/Segment/SAL/HKSALv6.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HKSALv6.php
rename to src/Segment/SAL/HKSALv6.php
diff --git a/lib/Fhp/Segment/SAL/HKSALv7.php b/src/Segment/SAL/HKSALv7.php
similarity index 100%
rename from lib/Fhp/Segment/SAL/HKSALv7.php
rename to src/Segment/SAL/HKSALv7.php
diff --git a/lib/Fhp/Segment/SPA/HISPA.php b/src/Segment/SPA/HISPA.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HISPA.php
rename to src/Segment/SPA/HISPA.php
diff --git a/lib/Fhp/Segment/SPA/HISPAS.php b/src/Segment/SPA/HISPAS.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HISPAS.php
rename to src/Segment/SPA/HISPAS.php
diff --git a/lib/Fhp/Segment/SPA/HISPASv1.php b/src/Segment/SPA/HISPASv1.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HISPASv1.php
rename to src/Segment/SPA/HISPASv1.php
diff --git a/lib/Fhp/Segment/SPA/HISPASv2.php b/src/Segment/SPA/HISPASv2.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HISPASv2.php
rename to src/Segment/SPA/HISPASv2.php
diff --git a/lib/Fhp/Segment/SPA/HISPASv3.php b/src/Segment/SPA/HISPASv3.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HISPASv3.php
rename to src/Segment/SPA/HISPASv3.php
diff --git a/lib/Fhp/Segment/SPA/HISPAv1.php b/src/Segment/SPA/HISPAv1.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HISPAv1.php
rename to src/Segment/SPA/HISPAv1.php
diff --git a/lib/Fhp/Segment/SPA/HISPAv2.php b/src/Segment/SPA/HISPAv2.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HISPAv2.php
rename to src/Segment/SPA/HISPAv2.php
diff --git a/lib/Fhp/Segment/SPA/HISPAv3.php b/src/Segment/SPA/HISPAv3.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HISPAv3.php
rename to src/Segment/SPA/HISPAv3.php
diff --git a/lib/Fhp/Segment/SPA/HKSPAv1.php b/src/Segment/SPA/HKSPAv1.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HKSPAv1.php
rename to src/Segment/SPA/HKSPAv1.php
diff --git a/lib/Fhp/Segment/SPA/HKSPAv2.php b/src/Segment/SPA/HKSPAv2.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HKSPAv2.php
rename to src/Segment/SPA/HKSPAv2.php
diff --git a/lib/Fhp/Segment/SPA/HKSPAv3.php b/src/Segment/SPA/HKSPAv3.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/HKSPAv3.php
rename to src/Segment/SPA/HKSPAv3.php
diff --git a/lib/Fhp/Segment/SPA/ParameterSepaKontoverbindungAnfordern.php b/src/Segment/SPA/ParameterSepaKontoverbindungAnfordern.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/ParameterSepaKontoverbindungAnfordern.php
rename to src/Segment/SPA/ParameterSepaKontoverbindungAnfordern.php
diff --git a/lib/Fhp/Segment/SPA/ParameterSepaKontoverbindungAnfordernV1.php b/src/Segment/SPA/ParameterSepaKontoverbindungAnfordernV1.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/ParameterSepaKontoverbindungAnfordernV1.php
rename to src/Segment/SPA/ParameterSepaKontoverbindungAnfordernV1.php
diff --git a/lib/Fhp/Segment/SPA/ParameterSepaKontoverbindungAnfordernV2.php b/src/Segment/SPA/ParameterSepaKontoverbindungAnfordernV2.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/ParameterSepaKontoverbindungAnfordernV2.php
rename to src/Segment/SPA/ParameterSepaKontoverbindungAnfordernV2.php
diff --git a/lib/Fhp/Segment/SPA/ParameterSepaKontoverbindungAnfordernV3.php b/src/Segment/SPA/ParameterSepaKontoverbindungAnfordernV3.php
similarity index 100%
rename from lib/Fhp/Segment/SPA/ParameterSepaKontoverbindungAnfordernV3.php
rename to src/Segment/SPA/ParameterSepaKontoverbindungAnfordernV3.php
diff --git a/lib/Fhp/Segment/SegmentDescriptor.php b/src/Segment/SegmentDescriptor.php
similarity index 100%
rename from lib/Fhp/Segment/SegmentDescriptor.php
rename to src/Segment/SegmentDescriptor.php
diff --git a/lib/Fhp/Segment/SegmentInterface.php b/src/Segment/SegmentInterface.php
similarity index 100%
rename from lib/Fhp/Segment/SegmentInterface.php
rename to src/Segment/SegmentInterface.php
diff --git a/lib/Fhp/Segment/Segmentkopf.php b/src/Segment/Segmentkopf.php
similarity index 100%
rename from lib/Fhp/Segment/Segmentkopf.php
rename to src/Segment/Segmentkopf.php
diff --git a/lib/Fhp/Segment/TAB/HITAB.php b/src/Segment/TAB/HITAB.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/HITAB.php
rename to src/Segment/TAB/HITAB.php
diff --git a/lib/Fhp/Segment/TAB/HITABSv4.php b/src/Segment/TAB/HITABSv4.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/HITABSv4.php
rename to src/Segment/TAB/HITABSv4.php
diff --git a/lib/Fhp/Segment/TAB/HITABSv5.php b/src/Segment/TAB/HITABSv5.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/HITABSv5.php
rename to src/Segment/TAB/HITABSv5.php
diff --git a/lib/Fhp/Segment/TAB/HITABv4.php b/src/Segment/TAB/HITABv4.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/HITABv4.php
rename to src/Segment/TAB/HITABv4.php
diff --git a/lib/Fhp/Segment/TAB/HITABv5.php b/src/Segment/TAB/HITABv5.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/HITABv5.php
rename to src/Segment/TAB/HITABv5.php
diff --git a/lib/Fhp/Segment/TAB/HKTABv4.php b/src/Segment/TAB/HKTABv4.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/HKTABv4.php
rename to src/Segment/TAB/HKTABv4.php
diff --git a/lib/Fhp/Segment/TAB/HKTABv5.php b/src/Segment/TAB/HKTABv5.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/HKTABv5.php
rename to src/Segment/TAB/HKTABv5.php
diff --git a/lib/Fhp/Segment/TAB/TanMediumListe.php b/src/Segment/TAB/TanMediumListe.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/TanMediumListe.php
rename to src/Segment/TAB/TanMediumListe.php
diff --git a/lib/Fhp/Segment/TAB/TanMediumListeV4.php b/src/Segment/TAB/TanMediumListeV4.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/TanMediumListeV4.php
rename to src/Segment/TAB/TanMediumListeV4.php
diff --git a/lib/Fhp/Segment/TAB/TanMediumListeV5.php b/src/Segment/TAB/TanMediumListeV5.php
similarity index 100%
rename from lib/Fhp/Segment/TAB/TanMediumListeV5.php
rename to src/Segment/TAB/TanMediumListeV5.php
diff --git a/lib/Fhp/Segment/TAN/AntwortHhdUc.php b/src/Segment/TAN/AntwortHhdUc.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/AntwortHhdUc.php
rename to src/Segment/TAN/AntwortHhdUc.php
diff --git a/lib/Fhp/Segment/TAN/GueltigkeitsdatumUndUhrzeitFuerChallenge.php b/src/Segment/TAN/GueltigkeitsdatumUndUhrzeitFuerChallenge.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/GueltigkeitsdatumUndUhrzeitFuerChallenge.php
rename to src/Segment/TAN/GueltigkeitsdatumUndUhrzeitFuerChallenge.php
diff --git a/lib/Fhp/Segment/TAN/HITAN.php b/src/Segment/TAN/HITAN.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HITAN.php
rename to src/Segment/TAN/HITAN.php
diff --git a/lib/Fhp/Segment/TAN/HITANS.php b/src/Segment/TAN/HITANS.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HITANS.php
rename to src/Segment/TAN/HITANS.php
diff --git a/lib/Fhp/Segment/TAN/HITANSv6.php b/src/Segment/TAN/HITANSv6.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HITANSv6.php
rename to src/Segment/TAN/HITANSv6.php
diff --git a/lib/Fhp/Segment/TAN/HITANSv7.php b/src/Segment/TAN/HITANSv7.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HITANSv7.php
rename to src/Segment/TAN/HITANSv7.php
diff --git a/lib/Fhp/Segment/TAN/HITANv6.php b/src/Segment/TAN/HITANv6.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HITANv6.php
rename to src/Segment/TAN/HITANv6.php
diff --git a/lib/Fhp/Segment/TAN/HITANv7.php b/src/Segment/TAN/HITANv7.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HITANv7.php
rename to src/Segment/TAN/HITANv7.php
diff --git a/lib/Fhp/Segment/TAN/HKTAN.php b/src/Segment/TAN/HKTAN.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HKTAN.php
rename to src/Segment/TAN/HKTAN.php
diff --git a/lib/Fhp/Segment/TAN/HKTANFactory.php b/src/Segment/TAN/HKTANFactory.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HKTANFactory.php
rename to src/Segment/TAN/HKTANFactory.php
diff --git a/lib/Fhp/Segment/TAN/HKTANv6.php b/src/Segment/TAN/HKTANv6.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HKTANv6.php
rename to src/Segment/TAN/HKTANv6.php
diff --git a/lib/Fhp/Segment/TAN/HKTANv7.php b/src/Segment/TAN/HKTANv7.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/HKTANv7.php
rename to src/Segment/TAN/HKTANv7.php
diff --git a/lib/Fhp/Segment/TAN/ParameterChallengeKlasse.php b/src/Segment/TAN/ParameterChallengeKlasse.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/ParameterChallengeKlasse.php
rename to src/Segment/TAN/ParameterChallengeKlasse.php
diff --git a/lib/Fhp/Segment/TAN/ParameterZweiSchrittTanEinreichung.php b/src/Segment/TAN/ParameterZweiSchrittTanEinreichung.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/ParameterZweiSchrittTanEinreichung.php
rename to src/Segment/TAN/ParameterZweiSchrittTanEinreichung.php
diff --git a/lib/Fhp/Segment/TAN/ParameterZweiSchrittTanEinreichungV6.php b/src/Segment/TAN/ParameterZweiSchrittTanEinreichungV6.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/ParameterZweiSchrittTanEinreichungV6.php
rename to src/Segment/TAN/ParameterZweiSchrittTanEinreichungV6.php
diff --git a/lib/Fhp/Segment/TAN/ParameterZweiSchrittTanEinreichungV7.php b/src/Segment/TAN/ParameterZweiSchrittTanEinreichungV7.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/ParameterZweiSchrittTanEinreichungV7.php
rename to src/Segment/TAN/ParameterZweiSchrittTanEinreichungV7.php
diff --git a/lib/Fhp/Segment/TAN/VerfahrensparameterZweiSchrittVerfahrenV6.php b/src/Segment/TAN/VerfahrensparameterZweiSchrittVerfahrenV6.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/VerfahrensparameterZweiSchrittVerfahrenV6.php
rename to src/Segment/TAN/VerfahrensparameterZweiSchrittVerfahrenV6.php
diff --git a/lib/Fhp/Segment/TAN/VerfahrensparameterZweiSchrittVerfahrenV7.php b/src/Segment/TAN/VerfahrensparameterZweiSchrittVerfahrenV7.php
similarity index 100%
rename from lib/Fhp/Segment/TAN/VerfahrensparameterZweiSchrittVerfahrenV7.php
rename to src/Segment/TAN/VerfahrensparameterZweiSchrittVerfahrenV7.php
diff --git a/lib/Fhp/Segment/UnterstuetzteSEPADatenformate.php b/src/Segment/UnterstuetzteSEPADatenformate.php
similarity index 100%
rename from lib/Fhp/Segment/UnterstuetzteSEPADatenformate.php
rename to src/Segment/UnterstuetzteSEPADatenformate.php
diff --git a/lib/Fhp/Segment/UnterstuetzteSEPADatenformateTrait.php b/src/Segment/UnterstuetzteSEPADatenformateTrait.php
similarity index 100%
rename from lib/Fhp/Segment/UnterstuetzteSEPADatenformateTrait.php
rename to src/Segment/UnterstuetzteSEPADatenformateTrait.php
diff --git a/lib/Fhp/Segment/VPA/HKVPAv1.php b/src/Segment/VPA/HKVPAv1.php
similarity index 100%
rename from lib/Fhp/Segment/VPA/HKVPAv1.php
rename to src/Segment/VPA/HKVPAv1.php
diff --git a/lib/Fhp/Segment/VPP/ErgebnisVopPruefungEinzeltransaktionV1.php b/src/Segment/VPP/ErgebnisVopPruefungEinzeltransaktionV1.php
similarity index 100%
rename from lib/Fhp/Segment/VPP/ErgebnisVopPruefungEinzeltransaktionV1.php
rename to src/Segment/VPP/ErgebnisVopPruefungEinzeltransaktionV1.php
diff --git a/lib/Fhp/Segment/VPP/HIVPPSv1.php b/src/Segment/VPP/HIVPPSv1.php
similarity index 100%
rename from lib/Fhp/Segment/VPP/HIVPPSv1.php
rename to src/Segment/VPP/HIVPPSv1.php
diff --git a/lib/Fhp/Segment/VPP/HIVPPv1.php b/src/Segment/VPP/HIVPPv1.php
similarity index 100%
rename from lib/Fhp/Segment/VPP/HIVPPv1.php
rename to src/Segment/VPP/HIVPPv1.php
diff --git a/lib/Fhp/Segment/VPP/HKVPPv1.php b/src/Segment/VPP/HKVPPv1.php
similarity index 100%
rename from lib/Fhp/Segment/VPP/HKVPPv1.php
rename to src/Segment/VPP/HKVPPv1.php
diff --git a/lib/Fhp/Segment/VPP/ParameterNamensabgleichPruefauftragV1.php b/src/Segment/VPP/ParameterNamensabgleichPruefauftragV1.php
similarity index 100%
rename from lib/Fhp/Segment/VPP/ParameterNamensabgleichPruefauftragV1.php
rename to src/Segment/VPP/ParameterNamensabgleichPruefauftragV1.php
diff --git a/lib/Fhp/Segment/VPP/UnterstuetztePaymentStatusReportsV1.php b/src/Segment/VPP/UnterstuetztePaymentStatusReportsV1.php
similarity index 100%
rename from lib/Fhp/Segment/VPP/UnterstuetztePaymentStatusReportsV1.php
rename to src/Segment/VPP/UnterstuetztePaymentStatusReportsV1.php
diff --git a/lib/Fhp/Segment/VPP/VopHelper.php b/src/Segment/VPP/VopHelper.php
similarity index 100%
rename from lib/Fhp/Segment/VPP/VopHelper.php
rename to src/Segment/VPP/VopHelper.php
diff --git a/lib/Fhp/Segment/WPD/HIWPD.php b/src/Segment/WPD/HIWPD.php
similarity index 100%
rename from lib/Fhp/Segment/WPD/HIWPD.php
rename to src/Segment/WPD/HIWPD.php
diff --git a/lib/Fhp/Segment/WPD/HIWPDS.php b/src/Segment/WPD/HIWPDS.php
similarity index 100%
rename from lib/Fhp/Segment/WPD/HIWPDS.php
rename to src/Segment/WPD/HIWPDS.php
diff --git a/lib/Fhp/Segment/WPD/HIWPDSv5.php b/src/Segment/WPD/HIWPDSv5.php
similarity index 100%
rename from lib/Fhp/Segment/WPD/HIWPDSv5.php
rename to src/Segment/WPD/HIWPDSv5.php
diff --git a/lib/Fhp/Segment/WPD/HIWPDv5.php b/src/Segment/WPD/HIWPDv5.php
similarity index 100%
rename from lib/Fhp/Segment/WPD/HIWPDv5.php
rename to src/Segment/WPD/HIWPDv5.php
diff --git a/lib/Fhp/Segment/WPD/HKWPDv5.php b/src/Segment/WPD/HKWPDv5.php
similarity index 100%
rename from lib/Fhp/Segment/WPD/HKWPDv5.php
rename to src/Segment/WPD/HKWPDv5.php
diff --git a/lib/Fhp/Segment/WPD/ParameterDepotaufstellung.php b/src/Segment/WPD/ParameterDepotaufstellung.php
similarity index 100%
rename from lib/Fhp/Segment/WPD/ParameterDepotaufstellung.php
rename to src/Segment/WPD/ParameterDepotaufstellung.php
diff --git a/lib/Fhp/Segment/WPD/ParameterDepotaufstellungV2.php b/src/Segment/WPD/ParameterDepotaufstellungV2.php
similarity index 100%
rename from lib/Fhp/Segment/WPD/ParameterDepotaufstellungV2.php
rename to src/Segment/WPD/ParameterDepotaufstellungV2.php
diff --git a/lib/Fhp/Syntax/Bin.php b/src/Syntax/Bin.php
similarity index 100%
rename from lib/Fhp/Syntax/Bin.php
rename to src/Syntax/Bin.php
diff --git a/lib/Fhp/Syntax/Delimiter.php b/src/Syntax/Delimiter.php
similarity index 100%
rename from lib/Fhp/Syntax/Delimiter.php
rename to src/Syntax/Delimiter.php
diff --git a/lib/Fhp/Syntax/InvalidResponseException.php b/src/Syntax/InvalidResponseException.php
similarity index 100%
rename from lib/Fhp/Syntax/InvalidResponseException.php
rename to src/Syntax/InvalidResponseException.php
diff --git a/lib/Fhp/Syntax/Parser.php b/src/Syntax/Parser.php
similarity index 100%
rename from lib/Fhp/Syntax/Parser.php
rename to src/Syntax/Parser.php
diff --git a/lib/Fhp/Syntax/Serializer.php b/src/Syntax/Serializer.php
similarity index 100%
rename from lib/Fhp/Syntax/Serializer.php
rename to src/Syntax/Serializer.php
diff --git a/lib/Fhp/UnsupportedException.php b/src/UnsupportedException.php
similarity index 100%
rename from lib/Fhp/UnsupportedException.php
rename to src/UnsupportedException.php