diff --git a/Configuration/.htaccess b/Configuration/.htaccess
new file mode 100644
index 0000000..9a2aa5a
--- /dev/null
+++ b/Configuration/.htaccess
@@ -0,0 +1,11 @@
+# Apache < 2.3
+
+ Order allow,deny
+ Deny from all
+ Satisfy All
+
+
+# Apache ≥ 2.3
+
+ Require all denied
+
diff --git a/Configuration/ExtensionBuilder/settings.yaml b/Configuration/ExtensionBuilder/settings.yaml
deleted file mode 100644
index 158479a..0000000
--- a/Configuration/ExtensionBuilder/settings.yaml
+++ /dev/null
@@ -1,93 +0,0 @@
-#
-# Extension Builder settings for extension tea
-# generated 2013-11-01
-#
-# See http://www.yaml.org/spec/1.2/spec.html
-#
-
----
-
-########### Overwrite settings ###########
-#
-# These settings only apply, if the roundtrip feature of the extension builder
-# is enabled in the extension manager
-#
-# Usage:
-# nesting reflects the file structure
-# a setting applies to a file or recursive to all files and subfolders
-#
-# merge:
-# means for classes: All properties ,methods and method bodies
-# of the existing class will be modified according to the new settings
-# but not overwritten
-#
-# for locallang xml files: Existing keys and labels are always
-# preserved (renaming in the GUI has only influence on the property and method names)
-#
-# for other files: You will find a Split token at the end of the file
-# After this token you can write whatever you want and it will be appended
-# everytime the code is generated
-#
-# keep:
-# files are never overwritten
-# These settings may break the functionality of the extension builder!
-# Handle with care!
-#
-#
-
-############ extension settings ##############
-
-overwriteSettings:
- Classes:
- Controller: merge
- Domain:
- Model: merge
- Repository: merge
-
- Configuration:
- #TCA: merge
- #TypoScript: keep
-
- Resources:
- Private:
- Language:
- #locallang.xml: merge
- #locallang.xlf: merge
- #Templates: keep
-
- ext_icon.gif: keep
-
-# ext_localconf.php: merge
-
-# ext_tables.php: merge
-
-# ext_tables.sql: merge
-
-## ext_autoload.php is only needed in special cases ##
-createAutoloadRegistry: false
-
-######### settings for classBuilder #############################
-#
-# here you may define default parent classes for your classes
-# these settings only apply for new generated classes
-# you may also just change the parent class in the generated class file.
-# It will be kept on next code generation, if the overwrite settings
-# are configured to merge it
-#
-# Experimental!!
-#################################################################
-
-classBuilder:
-
- Controller:
- parentClass: \TYPO3\CMS\Extbase\Mvc\Controller\ActionController
-
- Model:
- AbstractEntity:
- parentClass: \TYPO3\CMS\Extbase\DomainObject\AbstractEntity
-
- AbstractValueObject:
- parentClass: \TYPO3\CMS\Extbase\DomainObject\AbstractValueObject
-
- Repository:
- parentClass: \TYPO3\CMS\Extbase\Persistence\Repository
\ No newline at end of file
diff --git a/ExtensionBuilder.json b/ExtensionBuilder.json
deleted file mode 100644
index faa7689..0000000
--- a/ExtensionBuilder.json
+++ /dev/null
@@ -1 +0,0 @@
-{"modules":[{"config":{"position":[658,132]},"name":"New Model Object","value":{"actionGroup":{"_default0_list":false,"_default1_show":false,"_default2_new_create":false,"_default3_edit_update":false,"_default4_delete":false,"customActions":[]},"name":"TeaBeverage","objectsettings":{"aggregateRoot":true,"description":"Tea beverage","mapToTable":"","parentClass":"","sorting":false,"type":"Entity","uid":"264022070620"},"propertyGroup":{"properties":[{"propertyDescription":"size","propertyIsExcludeField":false,"propertyIsRequired":false,"propertyName":"size","propertyType":"Float","uid":"686745089204"}]},"relationGroup":{"relations":[{"foreignRelationClass":"","lazyLoading":true,"propertyIsExcludeField":false,"relationDescription":"type","relationName":"type","relationType":"manyToOne","relationWire":"[wired]","uid":"381688624164"},{"foreignRelationClass":"","lazyLoading":true,"propertyIsExcludeField":false,"relationDescription":"additions","relationName":"additions","relationType":"manyToMany","relationWire":"[wired]","uid":"1077905653897"},{"foreignRelationClass":"","lazyLoading":true,"propertyIsExcludeField":false,"relationDescription":"testimonials","relationName":"testimonials","relationType":"zeroToMany","relationWire":"[wired]","uid":"612872844633"}]}}},{"config":{"position":[71,142]},"name":"New Model Object","value":{"actionGroup":{"_default0_list":false,"_default1_show":false,"_default2_new_create":false,"_default3_edit_update":false,"_default4_delete":false,"customActions":[]},"name":"TeaType","objectsettings":{"aggregateRoot":false,"description":"Tea type","mapToTable":"","parentClass":"","sorting":false,"type":"Entity","uid":"1351448414985"},"propertyGroup":{"properties":[{"propertyDescription":"title","propertyIsExcludeField":false,"propertyIsRequired":true,"propertyName":"title","propertyType":"String","uid":"514346914201"},{"propertyDescription":"caffeinated","propertyIsExcludeField":false,"propertyIsRequired":false,"propertyName":"caffeinated","propertyType":"Boolean","uid":"314036724989"}]},"relationGroup":{"relations":[]}}},{"config":{"position":[35,391]},"name":"New Model Object","value":{"actionGroup":{"_default0_list":false,"_default1_show":false,"_default2_new_create":false,"_default3_edit_update":false,"_default4_delete":false,"customActions":[]},"name":"Addition","objectsettings":{"aggregateRoot":false,"description":"addition","mapToTable":"","parentClass":"","sorting":false,"type":"ValueObject","uid":"1270408953807"},"propertyGroup":{"properties":[{"propertyDescription":"title","propertyIsExcludeField":false,"propertyIsRequired":true,"propertyName":"title","propertyType":"String","uid":"846205806952"}]},"relationGroup":{"relations":[]}}},{"config":{"position":[642,507]},"name":"New Model Object","value":{"actionGroup":{"_default0_list":false,"_default1_show":false,"_default2_new_create":false,"_default3_edit_update":false,"_default4_delete":false,"customActions":[]},"name":"Testimonial","objectsettings":{"aggregateRoot":true,"description":"Testimonial","mapToTable":"","parentClass":"","sorting":false,"type":"Entity","uid":"539309147575"},"propertyGroup":{"properties":[{"propertyDescription":"date of posting","propertyIsExcludeField":false,"propertyIsRequired":false,"propertyName":"dateOfPosting","propertyType":"NativeDateTime","uid":"927757775346"},{"propertyDescription":"number of consumed cups","propertyIsExcludeField":false,"propertyIsRequired":false,"propertyName":"numberOfConsumedCups","propertyType":"Integer","uid":"193382428427"},{"propertyDescription":"text","propertyIsExcludeField":false,"propertyIsRequired":false,"propertyName":"text","propertyType":"Text","uid":"563552582384"}]},"relationGroup":{"relations":[]}}}],"properties":{"backendModules":[],"description":"This extension serves as an example on how to unit-test different data types and relation types in TYPO3 extensions.","emConf":{"category":"plugin","custom_category":"","dependsOn":"extbase => 6.0\nfluid => 6.0\ntypo3 => 6.0\n","disableLocalization":false,"disableVersioning":false,"priority":"","shy":false,"state":"alpha","targetVersion":"6.0","version":""},"extensionKey":"tea","name":"Tea example","originalExtensionKey":"tea","persons":[{"company":"oliverklee.de","email":"typo3-coding@oliverklee.de","name":"Oliver Klee","role":"Developer"}],"plugins":[],"vendorName":"OliverKlee"},"wires":[{"src":{"moduleId":0,"terminal":"relationWire_0","uid":"381688624164"},"tgt":{"moduleId":1,"terminal":"SOURCES","uid":"1351448414985"}},{"src":{"moduleId":0,"terminal":"relationWire_1","uid":"1077905653897"},"tgt":{"moduleId":2,"terminal":"SOURCES","uid":"1270408953807"}},{"src":{"moduleId":0,"terminal":"relationWire_2","uid":"612872844633"},"tgt":{"moduleId":3,"terminal":"SOURCES","uid":"539309147575"}}],"log":{"last_modified":"2013-11-01 09:35","extension_builder_version":"2.5.2","be_user":"Oliver Klee (1)"}}
\ No newline at end of file
diff --git a/Resources/Private/.htaccess b/Resources/Private/.htaccess
index dfc0272..9a2aa5a 100644
--- a/Resources/Private/.htaccess
+++ b/Resources/Private/.htaccess
@@ -1 +1,11 @@
-deny from all
\ No newline at end of file
+# Apache < 2.3
+
+ Order allow,deny
+ Deny from all
+ Satisfy All
+
+
+# Apache ≥ 2.3
+
+ Require all denied
+