diff --git a/dlf/Configuration/TCA/tx_dlf_actionlog.php b/Configuration/TCA/tx_dlf_actionlog.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_actionlog.php
rename to Configuration/TCA/tx_dlf_actionlog.php
diff --git a/dlf/Configuration/TCA/tx_dlf_basket.php b/Configuration/TCA/tx_dlf_basket.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_basket.php
rename to Configuration/TCA/tx_dlf_basket.php
diff --git a/dlf/Configuration/TCA/tx_dlf_collections.php b/Configuration/TCA/tx_dlf_collections.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_collections.php
rename to Configuration/TCA/tx_dlf_collections.php
diff --git a/dlf/Configuration/TCA/tx_dlf_documents.php b/Configuration/TCA/tx_dlf_documents.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_documents.php
rename to Configuration/TCA/tx_dlf_documents.php
diff --git a/dlf/Configuration/TCA/tx_dlf_formats.php b/Configuration/TCA/tx_dlf_formats.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_formats.php
rename to Configuration/TCA/tx_dlf_formats.php
diff --git a/dlf/Configuration/TCA/tx_dlf_libraries.php b/Configuration/TCA/tx_dlf_libraries.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_libraries.php
rename to Configuration/TCA/tx_dlf_libraries.php
diff --git a/dlf/Configuration/TCA/tx_dlf_mail.php b/Configuration/TCA/tx_dlf_mail.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_mail.php
rename to Configuration/TCA/tx_dlf_mail.php
diff --git a/dlf/Configuration/TCA/tx_dlf_metadata.php b/Configuration/TCA/tx_dlf_metadata.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_metadata.php
rename to Configuration/TCA/tx_dlf_metadata.php
diff --git a/dlf/Configuration/TCA/tx_dlf_metadataformat.php b/Configuration/TCA/tx_dlf_metadataformat.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_metadataformat.php
rename to Configuration/TCA/tx_dlf_metadataformat.php
diff --git a/dlf/Configuration/TCA/tx_dlf_printer.php b/Configuration/TCA/tx_dlf_printer.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_printer.php
rename to Configuration/TCA/tx_dlf_printer.php
diff --git a/dlf/Configuration/TCA/tx_dlf_solrcores.php b/Configuration/TCA/tx_dlf_solrcores.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_solrcores.php
rename to Configuration/TCA/tx_dlf_solrcores.php
diff --git a/dlf/Configuration/TCA/tx_dlf_structures.php b/Configuration/TCA/tx_dlf_structures.php
similarity index 100%
rename from dlf/Configuration/TCA/tx_dlf_structures.php
rename to Configuration/TCA/tx_dlf_structures.php
diff --git a/dlf/Configuration/TypoScript/constants.txt b/Configuration/TypoScript/constants.txt
similarity index 100%
rename from dlf/Configuration/TypoScript/constants.txt
rename to Configuration/TypoScript/constants.txt
diff --git a/dlf/Configuration/TypoScript/setup.txt b/Configuration/TypoScript/setup.txt
similarity index 100%
rename from dlf/Configuration/TypoScript/setup.txt
rename to Configuration/TypoScript/setup.txt
diff --git a/dlf/Documentation/Administrator/Index.rst b/Documentation/Administrator/Index.rst
similarity index 100%
rename from dlf/Documentation/Administrator/Index.rst
rename to Documentation/Administrator/Index.rst
diff --git a/dlf/Documentation/Community/Index.rst b/Documentation/Community/Index.rst
similarity index 100%
rename from dlf/Documentation/Community/Index.rst
rename to Documentation/Community/Index.rst
diff --git a/dlf/Documentation/Configuration/Index.rst b/Documentation/Configuration/Index.rst
similarity index 100%
rename from dlf/Documentation/Configuration/Index.rst
rename to Documentation/Configuration/Index.rst
diff --git a/dlf/Documentation/Developer/Index.rst b/Documentation/Developer/Index.rst
similarity index 100%
rename from dlf/Documentation/Developer/Index.rst
rename to Documentation/Developer/Index.rst
diff --git a/dlf/Documentation/Images/AdministratorManual/ExtensionManager.png b/Documentation/Images/AdministratorManual/ExtensionManager.png
similarity index 100%
rename from dlf/Documentation/Images/AdministratorManual/ExtensionManager.png
rename to Documentation/Images/AdministratorManual/ExtensionManager.png
diff --git a/dlf/Documentation/Images/Configuration/typo3_install_pagenotfoundonchasherror.png b/Documentation/Images/Configuration/typo3_install_pagenotfoundonchasherror.png
similarity index 100%
rename from dlf/Documentation/Images/Configuration/typo3_install_pagenotfoundonchasherror.png
rename to Documentation/Images/Configuration/typo3_install_pagenotfoundonchasherror.png
diff --git a/dlf/Documentation/Images/Configuration/typo3_pagenotfoundonchasherror.png b/Documentation/Images/Configuration/typo3_pagenotfoundonchasherror.png
similarity index 100%
rename from dlf/Documentation/Images/Configuration/typo3_pagenotfoundonchasherror.png
rename to Documentation/Images/Configuration/typo3_pagenotfoundonchasherror.png
diff --git a/dlf/Documentation/Images/Introduction/KitodoPresentaion-SLUB1.PNG b/Documentation/Images/Introduction/KitodoPresentaion-SLUB1.PNG
similarity index 100%
rename from dlf/Documentation/Images/Introduction/KitodoPresentaion-SLUB1.PNG
rename to Documentation/Images/Introduction/KitodoPresentaion-SLUB1.PNG
diff --git a/dlf/Documentation/Images/Introduction/KitodoPresentation-SLUB-DresdenDaily.PNG b/Documentation/Images/Introduction/KitodoPresentation-SLUB-DresdenDaily.PNG
similarity index 100%
rename from dlf/Documentation/Images/Introduction/KitodoPresentation-SLUB-DresdenDaily.PNG
rename to Documentation/Images/Introduction/KitodoPresentation-SLUB-DresdenDaily.PNG
diff --git a/dlf/Documentation/Images/Introduction/KitodoPresentation-SLUB-Kalenderansicht.PNG b/Documentation/Images/Introduction/KitodoPresentation-SLUB-Kalenderansicht.PNG
similarity index 100%
rename from dlf/Documentation/Images/Introduction/KitodoPresentation-SLUB-Kalenderansicht.PNG
rename to Documentation/Images/Introduction/KitodoPresentation-SLUB-Kalenderansicht.PNG
diff --git a/dlf/Documentation/Images/Introduction/KitodoPresentation-SLUB-Volltexte.PNG b/Documentation/Images/Introduction/KitodoPresentation-SLUB-Volltexte.PNG
similarity index 100%
rename from dlf/Documentation/Images/Introduction/KitodoPresentation-SLUB-Volltexte.PNG
rename to Documentation/Images/Introduction/KitodoPresentation-SLUB-Volltexte.PNG
diff --git a/dlf/Documentation/Images/IntroductionPackage.png b/Documentation/Images/IntroductionPackage.png
similarity index 100%
rename from dlf/Documentation/Images/IntroductionPackage.png
rename to Documentation/Images/IntroductionPackage.png
diff --git a/dlf/Documentation/Includes.txt b/Documentation/Includes.txt
similarity index 100%
rename from dlf/Documentation/Includes.txt
rename to Documentation/Includes.txt
diff --git a/dlf/Documentation/Index.rst b/Documentation/Index.rst
similarity index 100%
rename from dlf/Documentation/Index.rst
rename to Documentation/Index.rst
diff --git a/dlf/Documentation/Introduction/Index.rst b/Documentation/Introduction/Index.rst
similarity index 100%
rename from dlf/Documentation/Introduction/Index.rst
rename to Documentation/Introduction/Index.rst
diff --git a/dlf/Documentation/Plugins/Index.rst b/Documentation/Plugins/Index.rst
similarity index 100%
rename from dlf/Documentation/Plugins/Index.rst
rename to Documentation/Plugins/Index.rst
diff --git a/dlf/Documentation/Readme.rst b/Documentation/Readme.rst
similarity index 100%
rename from dlf/Documentation/Readme.rst
rename to Documentation/Readme.rst
diff --git a/dlf/Documentation/Settings.yml b/Documentation/Settings.yml
similarity index 100%
rename from dlf/Documentation/Settings.yml
rename to Documentation/Settings.yml
diff --git a/dlf/Documentation/Targets.rst b/Documentation/Targets.rst
similarity index 100%
rename from dlf/Documentation/Targets.rst
rename to Documentation/Targets.rst
diff --git a/dlf/Documentation/User/Index.rst b/Documentation/User/Index.rst
similarity index 100%
rename from dlf/Documentation/User/Index.rst
rename to Documentation/User/Index.rst
diff --git a/dlf/LICENSE.txt b/LICENSE.txt
similarity index 100%
rename from dlf/LICENSE.txt
rename to LICENSE.txt
diff --git a/dlf/Resources/Public/Javascript/jquery-2.2.4.min.js b/Resources/Public/Javascript/jquery-2.2.4.min.js
similarity index 100%
rename from dlf/Resources/Public/Javascript/jquery-2.2.4.min.js
rename to Resources/Public/Javascript/jquery-2.2.4.min.js
diff --git a/dlf/Resources/Public/Javascript/jquery-ui-mouse-slider-resizable-autocomplete.js b/Resources/Public/Javascript/jquery-ui-mouse-slider-resizable-autocomplete.js
similarity index 100%
rename from dlf/Resources/Public/Javascript/jquery-ui-mouse-slider-resizable-autocomplete.js
rename to Resources/Public/Javascript/jquery-ui-mouse-slider-resizable-autocomplete.js
diff --git a/dlf/class.ext_update.php b/class.ext_update.php
similarity index 100%
rename from dlf/class.ext_update.php
rename to class.ext_update.php
diff --git a/dlf/cli/class.tx_dlf_cli.php b/cli/class.tx_dlf_cli.php
similarity index 100%
rename from dlf/cli/class.tx_dlf_cli.php
rename to cli/class.tx_dlf_cli.php
diff --git a/dlf/common/class.tx_dlf_alto.php b/common/class.tx_dlf_alto.php
similarity index 100%
rename from dlf/common/class.tx_dlf_alto.php
rename to common/class.tx_dlf_alto.php
diff --git a/dlf/common/class.tx_dlf_document.php b/common/class.tx_dlf_document.php
similarity index 100%
rename from dlf/common/class.tx_dlf_document.php
rename to common/class.tx_dlf_document.php
diff --git a/dlf/common/class.tx_dlf_format.php b/common/class.tx_dlf_format.php
similarity index 100%
rename from dlf/common/class.tx_dlf_format.php
rename to common/class.tx_dlf_format.php
diff --git a/dlf/common/class.tx_dlf_fulltext.php b/common/class.tx_dlf_fulltext.php
similarity index 100%
rename from dlf/common/class.tx_dlf_fulltext.php
rename to common/class.tx_dlf_fulltext.php
diff --git a/dlf/common/class.tx_dlf_helper.php b/common/class.tx_dlf_helper.php
similarity index 100%
rename from dlf/common/class.tx_dlf_helper.php
rename to common/class.tx_dlf_helper.php
diff --git a/dlf/common/class.tx_dlf_indexing.php b/common/class.tx_dlf_indexing.php
similarity index 100%
rename from dlf/common/class.tx_dlf_indexing.php
rename to common/class.tx_dlf_indexing.php
diff --git a/dlf/common/class.tx_dlf_list.php b/common/class.tx_dlf_list.php
similarity index 100%
rename from dlf/common/class.tx_dlf_list.php
rename to common/class.tx_dlf_list.php
diff --git a/dlf/common/class.tx_dlf_mods.php b/common/class.tx_dlf_mods.php
similarity index 100%
rename from dlf/common/class.tx_dlf_mods.php
rename to common/class.tx_dlf_mods.php
diff --git a/dlf/common/class.tx_dlf_module.php b/common/class.tx_dlf_module.php
similarity index 100%
rename from dlf/common/class.tx_dlf_module.php
rename to common/class.tx_dlf_module.php
diff --git a/dlf/common/class.tx_dlf_plugin.php b/common/class.tx_dlf_plugin.php
similarity index 100%
rename from dlf/common/class.tx_dlf_plugin.php
rename to common/class.tx_dlf_plugin.php
diff --git a/dlf/common/class.tx_dlf_solr.php b/common/class.tx_dlf_solr.php
similarity index 100%
rename from dlf/common/class.tx_dlf_solr.php
rename to common/class.tx_dlf_solr.php
diff --git a/dlf/common/class.tx_dlf_teihdr.php b/common/class.tx_dlf_teihdr.php
similarity index 100%
rename from dlf/common/class.tx_dlf_teihdr.php
rename to common/class.tx_dlf_teihdr.php
diff --git a/dlf/common/locallang.xml b/common/locallang.xml
similarity index 100%
rename from dlf/common/locallang.xml
rename to common/locallang.xml
diff --git a/dlf/ABOUT.txt b/dlf/ABOUT.txt
deleted file mode 100644
index a16a87402..000000000
--- a/dlf/ABOUT.txt
+++ /dev/null
@@ -1,85 +0,0 @@
-Kitodo. Key to digital objects
-==============================
-
-Kitodo is an open source software suite intended to support mass digitization
-projects for cultural heritage institutions. Kitodo is widely-used and
-cooperatively maintained by major German libraries and digitization service
-providers.
-Kitodo consists of several independent modules serving different purposes such as
-controlling the digitization workflow, enriching descriptive and structural
-metadata, and presenting the results to the public in a modern and convenient
-way.
-Kitodo was formerly known as Goobi.
-
-
-About Kitodo.Presentation
--------------------------
-
-Kitodo.Presentation is a feature-rich framework for building a METS-based digital
-library. It is highly customizable through a user-friendly backend and flexible
-design templates. Since it is based on the great free and open source Content
-Management System TYPO3 (http://typo3.org), it integrates perfectly with your
-website and can easily be managed by editors. Kitodo.Presentation provides a
-comprehensive toolset covering all requirements for presenting digitized media.
-It implements international standards such as IIIF Image API, OAI Protocol for
-Metadata Harvesting, METS, MODS, TEI, ALTO, and can be configured to support any
-other descriptive XML format using simple XPath expressions.
-
-
-About the naming of Kitodo.Presentation
----------------------------------------
-
-The Kitodo Software Suite is used for digitizing huge amounts of books, journals,
-newspapers, and other printed and hand-written material, and making it available
-to the public. Thus Kitodo helps collecting, archiving and providing knowledge to
-everyone. This is a great task that inspired many writers of not only science
-fiction and fantasy novels, too. Thus there are many brilliant stories in which
-libraries or librarians play an important role.
-We therefore decided to name each major release of Kitodo.Presentation after a
-fictional librarian from one of these novels who ideally shares our vision of
-collecting and publishing the entirety of human knowledge one day (or who at
-least is an extraordinary remarkable character in the plot).
-
-1.0: Horace Worblehat
-Horace Worblehat is the Librarian of the Library of the Unseen University (UU)
-in Terry Pratchett's fantasy series of "Discworld" novels.
-Like the Bodleian Library at Oxford, the UU Library features chained books –
-although at Oxford this is done to protect the books from the students, whereas
-at UU it is done to protect the students from the books. The high concentration
-of magical lore makes it possible for the Library to contain every book ever
-written, possibly written, unwritten and yet to be written.
-The Librarian appeared in the first novel of the series and was transformed into
-an orang-utan by accident while handling a magical book in a later novel. On
-discovering that being an orang-utan had certain advantages for a librarian - he
-can climb up to high shelves, for example - he refused to be transformed back
-into a human and has remained an orang-utan ever since.
-(partly from http://en.wikipedia.org/wiki/Unseen_University)
-
-1.1: Patterson Tchung
-In Frank Herbert's book "Direct Descent" the 81st century Earth has been
-hollowed out entirely and turned into a planet-sized library. The innards of the
-Earth were used to construct a fleet of ships that colonized the stars while the
-people who remained behind dedicated themselves to the pursuit of knowledge.
-They sent wave after wave of librarians out who collected knowledge, returned to
-Earth, created programming about their discoveries and then broadcast those
-programs to everyone in the universe for free.
-The director of this library is (in the second part of the book) an intelligent
-simian named Patterson Tchung.
-(partly from http://www.omphalosbookreviews.com/index.php/reviews/info/453)
-
-1.2: Hari Seldon
-Hari Seldon, a mathematician and psychologist in Isaac Asimov's first science
-fiction novel of the "Foundation Trilogy", has developed psychohistory, a new
-field of science and psychology that equates all possibilities in large societies
-to mathematics, allowing for the prediction of future events. Using psychohistory
-he has discovered the declining nature of the 12,000-year-old Galactic Empire,
-which will collapse within 500 years and enter a 30,000-year dark age. However,
-he believes that creating a compendium of all human knowledge, the Encyclopedia
-Galactica, would not avert the inevitable fall of the Empire but would reduce the
-dark age to one millennium.
-Hari Seldon departs to a remote world with other Encyclopedists to start working
-on his foresightful plan to compile the Encyclopedia Galactica.
-(partly from http://en.wikipedia.org/wiki/Foundation_(novel))
-
-2.0: The Librarian
-Snow Crash from Neal Stephenson
diff --git a/dlf/NOTICE.txt b/dlf/NOTICE.txt
deleted file mode 100644
index b76b19d18..000000000
--- a/dlf/NOTICE.txt
+++ /dev/null
@@ -1,9 +0,0 @@
-For more information on the Kitodo project, please visit the
-following websites:
- - https://www.kitodo.org/
- - https://github.com/kitodo
-
-For more information on the TYPO3 project, please visit the
-following websites:
- - https://typo3.org/
- - https://github.com/typo3
diff --git a/dlf/ext_autoload.php b/ext_autoload.php
similarity index 100%
rename from dlf/ext_autoload.php
rename to ext_autoload.php
diff --git a/dlf/ext_conf_template.txt b/ext_conf_template.txt
similarity index 100%
rename from dlf/ext_conf_template.txt
rename to ext_conf_template.txt
diff --git a/dlf/ext_emconf.php b/ext_emconf.php
similarity index 100%
rename from dlf/ext_emconf.php
rename to ext_emconf.php
diff --git a/dlf/ext_icon.gif b/ext_icon.gif
similarity index 100%
rename from dlf/ext_icon.gif
rename to ext_icon.gif
diff --git a/dlf/ext_localconf.php b/ext_localconf.php
similarity index 100%
rename from dlf/ext_localconf.php
rename to ext_localconf.php
diff --git a/dlf/ext_tables.php b/ext_tables.php
similarity index 100%
rename from dlf/ext_tables.php
rename to ext_tables.php
diff --git a/dlf/ext_tables.sql b/ext_tables.sql
similarity index 100%
rename from dlf/ext_tables.sql
rename to ext_tables.sql
diff --git a/dlf/hooks/class.tx_dlf_doctype.php b/hooks/class.tx_dlf_doctype.php
similarity index 100%
rename from dlf/hooks/class.tx_dlf_doctype.php
rename to hooks/class.tx_dlf_doctype.php
diff --git a/dlf/hooks/class.tx_dlf_em.php b/hooks/class.tx_dlf_em.php
similarity index 100%
rename from dlf/hooks/class.tx_dlf_em.php
rename to hooks/class.tx_dlf_em.php
diff --git a/dlf/hooks/class.tx_dlf_hacks.php b/hooks/class.tx_dlf_hacks.php
similarity index 100%
rename from dlf/hooks/class.tx_dlf_hacks.php
rename to hooks/class.tx_dlf_hacks.php
diff --git a/dlf/hooks/class.tx_dlf_tceforms.php b/hooks/class.tx_dlf_tceforms.php
similarity index 100%
rename from dlf/hooks/class.tx_dlf_tceforms.php
rename to hooks/class.tx_dlf_tceforms.php
diff --git a/dlf/hooks/class.tx_dlf_tcemain.php b/hooks/class.tx_dlf_tcemain.php
similarity index 100%
rename from dlf/hooks/class.tx_dlf_tcemain.php
rename to hooks/class.tx_dlf_tcemain.php
diff --git a/dlf/lib/ApacheSolr/LICENSE.txt b/lib/ApacheSolr/LICENSE.txt
similarity index 100%
rename from dlf/lib/ApacheSolr/LICENSE.txt
rename to lib/ApacheSolr/LICENSE.txt
diff --git a/dlf/lib/ApacheSolr/README.txt b/lib/ApacheSolr/README.txt
similarity index 100%
rename from dlf/lib/ApacheSolr/README.txt
rename to lib/ApacheSolr/README.txt
diff --git a/dlf/lib/ApacheSolr/conf/protwords.txt b/lib/ApacheSolr/conf/protwords.txt
similarity index 100%
rename from dlf/lib/ApacheSolr/conf/protwords.txt
rename to lib/ApacheSolr/conf/protwords.txt
diff --git a/dlf/lib/ApacheSolr/conf/schema.xml b/lib/ApacheSolr/conf/schema.xml
similarity index 100%
rename from dlf/lib/ApacheSolr/conf/schema.xml
rename to lib/ApacheSolr/conf/schema.xml
diff --git a/dlf/lib/ApacheSolr/conf/solr.xml b/lib/ApacheSolr/conf/solr.xml
similarity index 100%
rename from dlf/lib/ApacheSolr/conf/solr.xml
rename to lib/ApacheSolr/conf/solr.xml
diff --git a/dlf/lib/ApacheSolr/conf/solrconfig.xml b/lib/ApacheSolr/conf/solrconfig.xml
similarity index 100%
rename from dlf/lib/ApacheSolr/conf/solrconfig.xml
rename to lib/ApacheSolr/conf/solrconfig.xml
diff --git a/dlf/lib/ApacheSolr/conf/stopwords.txt b/lib/ApacheSolr/conf/stopwords.txt
similarity index 100%
rename from dlf/lib/ApacheSolr/conf/stopwords.txt
rename to lib/ApacheSolr/conf/stopwords.txt
diff --git a/dlf/lib/ApacheSolr/conf/synonyms.txt b/lib/ApacheSolr/conf/synonyms.txt
similarity index 100%
rename from dlf/lib/ApacheSolr/conf/synonyms.txt
rename to lib/ApacheSolr/conf/synonyms.txt
diff --git a/dlf/lib/ApacheSolr/patches/solr/webapp/web/WEB-INF/web.xml b/lib/ApacheSolr/patches/solr/webapp/web/WEB-INF/web.xml
similarity index 100%
rename from dlf/lib/ApacheSolr/patches/solr/webapp/web/WEB-INF/web.xml
rename to lib/ApacheSolr/patches/solr/webapp/web/WEB-INF/web.xml
diff --git a/dlf/lib/ApacheSolr/solr.xml b/lib/ApacheSolr/solr.xml
similarity index 100%
rename from dlf/lib/ApacheSolr/solr.xml
rename to lib/ApacheSolr/solr.xml
diff --git a/dlf/lib/ISO-639/iso-639-1.xml b/lib/ISO-639/iso-639-1.xml
similarity index 100%
rename from dlf/lib/ISO-639/iso-639-1.xml
rename to lib/ISO-639/iso-639-1.xml
diff --git a/dlf/lib/ISO-639/iso-639-2b.xml b/lib/ISO-639/iso-639-2b.xml
similarity index 100%
rename from dlf/lib/ISO-639/iso-639-2b.xml
rename to lib/ISO-639/iso-639-2b.xml
diff --git a/dlf/lib/OpenLayers/README.md b/lib/OpenLayers/README.md
similarity index 100%
rename from dlf/lib/OpenLayers/README.md
rename to lib/OpenLayers/README.md
diff --git a/dlf/lib/OpenLayers/glif.min.js b/lib/OpenLayers/glif.min.js
similarity index 100%
rename from dlf/lib/OpenLayers/glif.min.js
rename to lib/OpenLayers/glif.min.js
diff --git a/dlf/lib/OpenLayers/ol3-dlf.js b/lib/OpenLayers/ol3-dlf.js
similarity index 100%
rename from dlf/lib/OpenLayers/ol3-dlf.js
rename to lib/OpenLayers/ol3-dlf.js
diff --git a/dlf/lib/OpenLayers/ol3-dlf.json b/lib/OpenLayers/ol3-dlf.json
similarity index 100%
rename from dlf/lib/OpenLayers/ol3-dlf.json
rename to lib/OpenLayers/ol3-dlf.json
diff --git a/dlf/lib/OpenLayers/ol3.css b/lib/OpenLayers/ol3.css
similarity index 100%
rename from dlf/lib/OpenLayers/ol3.css
rename to lib/OpenLayers/ol3.css
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/Document.php b/lib/SolrPhpClient/Apache/Solr/Document.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/Document.php
rename to lib/SolrPhpClient/Apache/Solr/Document.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/Exception.php b/lib/SolrPhpClient/Apache/Solr/Exception.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/Exception.php
rename to lib/SolrPhpClient/Apache/Solr/Exception.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Abstract.php b/lib/SolrPhpClient/Apache/Solr/HttpTransport/Abstract.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Abstract.php
rename to lib/SolrPhpClient/Apache/Solr/HttpTransport/Abstract.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Curl.php b/lib/SolrPhpClient/Apache/Solr/HttpTransport/Curl.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Curl.php
rename to lib/SolrPhpClient/Apache/Solr/HttpTransport/Curl.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/CurlNoReuse.php b/lib/SolrPhpClient/Apache/Solr/HttpTransport/CurlNoReuse.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/CurlNoReuse.php
rename to lib/SolrPhpClient/Apache/Solr/HttpTransport/CurlNoReuse.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/FileGetContents.php b/lib/SolrPhpClient/Apache/Solr/HttpTransport/FileGetContents.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/FileGetContents.php
rename to lib/SolrPhpClient/Apache/Solr/HttpTransport/FileGetContents.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Interface.php b/lib/SolrPhpClient/Apache/Solr/HttpTransport/Interface.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Interface.php
rename to lib/SolrPhpClient/Apache/Solr/HttpTransport/Interface.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Response.php b/lib/SolrPhpClient/Apache/Solr/HttpTransport/Response.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/HttpTransport/Response.php
rename to lib/SolrPhpClient/Apache/Solr/HttpTransport/Response.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/HttpTransportException.php b/lib/SolrPhpClient/Apache/Solr/HttpTransportException.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/HttpTransportException.php
rename to lib/SolrPhpClient/Apache/Solr/HttpTransportException.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/InvalidArgumentException.php b/lib/SolrPhpClient/Apache/Solr/InvalidArgumentException.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/InvalidArgumentException.php
rename to lib/SolrPhpClient/Apache/Solr/InvalidArgumentException.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/NoServiceAvailableException.php b/lib/SolrPhpClient/Apache/Solr/NoServiceAvailableException.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/NoServiceAvailableException.php
rename to lib/SolrPhpClient/Apache/Solr/NoServiceAvailableException.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/ParserException.php b/lib/SolrPhpClient/Apache/Solr/ParserException.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/ParserException.php
rename to lib/SolrPhpClient/Apache/Solr/ParserException.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/Response.php b/lib/SolrPhpClient/Apache/Solr/Response.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/Response.php
rename to lib/SolrPhpClient/Apache/Solr/Response.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/Service.php b/lib/SolrPhpClient/Apache/Solr/Service.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/Service.php
rename to lib/SolrPhpClient/Apache/Solr/Service.php
diff --git a/dlf/lib/SolrPhpClient/Apache/Solr/Service/Balancer.php b/lib/SolrPhpClient/Apache/Solr/Service/Balancer.php
similarity index 100%
rename from dlf/lib/SolrPhpClient/Apache/Solr/Service/Balancer.php
rename to lib/SolrPhpClient/Apache/Solr/Service/Balancer.php
diff --git a/dlf/lib/SolrPhpClient/LICENSE.txt b/lib/SolrPhpClient/LICENSE.txt
similarity index 100%
rename from dlf/lib/SolrPhpClient/LICENSE.txt
rename to lib/SolrPhpClient/LICENSE.txt
diff --git a/dlf/lib/SolrPhpClient/NOTICE.txt b/lib/SolrPhpClient/NOTICE.txt
similarity index 100%
rename from dlf/lib/SolrPhpClient/NOTICE.txt
rename to lib/SolrPhpClient/NOTICE.txt
diff --git a/dlf/lib/jPlayer/blue.monday/css/jplayer.blue.monday.css b/lib/jPlayer/blue.monday/css/jplayer.blue.monday.css
similarity index 100%
rename from dlf/lib/jPlayer/blue.monday/css/jplayer.blue.monday.css
rename to lib/jPlayer/blue.monday/css/jplayer.blue.monday.css
diff --git a/dlf/lib/jPlayer/blue.monday/css/jplayer.blue.monday.min.css b/lib/jPlayer/blue.monday/css/jplayer.blue.monday.min.css
similarity index 100%
rename from dlf/lib/jPlayer/blue.monday/css/jplayer.blue.monday.min.css
rename to lib/jPlayer/blue.monday/css/jplayer.blue.monday.min.css
diff --git a/dlf/lib/jPlayer/blue.monday/image/jplayer.blue.monday.jpg b/lib/jPlayer/blue.monday/image/jplayer.blue.monday.jpg
similarity index 100%
rename from dlf/lib/jPlayer/blue.monday/image/jplayer.blue.monday.jpg
rename to lib/jPlayer/blue.monday/image/jplayer.blue.monday.jpg
diff --git a/dlf/lib/jPlayer/blue.monday/image/jplayer.blue.monday.seeking.gif b/lib/jPlayer/blue.monday/image/jplayer.blue.monday.seeking.gif
similarity index 100%
rename from dlf/lib/jPlayer/blue.monday/image/jplayer.blue.monday.seeking.gif
rename to lib/jPlayer/blue.monday/image/jplayer.blue.monday.seeking.gif
diff --git a/dlf/lib/jPlayer/jquery.jplayer.js b/lib/jPlayer/jquery.jplayer.js
similarity index 100%
rename from dlf/lib/jPlayer/jquery.jplayer.js
rename to lib/jPlayer/jquery.jplayer.js
diff --git a/dlf/lib/jPlayer/jquery.jplayer.min.js b/lib/jPlayer/jquery.jplayer.min.js
similarity index 100%
rename from dlf/lib/jPlayer/jquery.jplayer.min.js
rename to lib/jPlayer/jquery.jplayer.min.js
diff --git a/dlf/lib/jPlayer/jquery.jplayer.swf b/lib/jPlayer/jquery.jplayer.swf
similarity index 100%
rename from dlf/lib/jPlayer/jquery.jplayer.swf
rename to lib/jPlayer/jquery.jplayer.swf
diff --git a/dlf/locallang.xml b/locallang.xml
similarity index 100%
rename from dlf/locallang.xml
rename to locallang.xml
diff --git a/dlf/modules/conf.php b/modules/conf.php
similarity index 100%
rename from dlf/modules/conf.php
rename to modules/conf.php
diff --git a/dlf/modules/indexing/conf.php b/modules/indexing/conf.php
similarity index 100%
rename from dlf/modules/indexing/conf.php
rename to modules/indexing/conf.php
diff --git a/dlf/modules/indexing/index.php b/modules/indexing/index.php
similarity index 100%
rename from dlf/modules/indexing/index.php
rename to modules/indexing/index.php
diff --git a/dlf/modules/indexing/locallang.xml b/modules/indexing/locallang.xml
similarity index 100%
rename from dlf/modules/indexing/locallang.xml
rename to modules/indexing/locallang.xml
diff --git a/dlf/modules/indexing/locallang_mod.xml b/modules/indexing/locallang_mod.xml
similarity index 100%
rename from dlf/modules/indexing/locallang_mod.xml
rename to modules/indexing/locallang_mod.xml
diff --git a/dlf/modules/indexing/template.tmpl b/modules/indexing/template.tmpl
similarity index 100%
rename from dlf/modules/indexing/template.tmpl
rename to modules/indexing/template.tmpl
diff --git a/dlf/modules/locallang_mod.xml b/modules/locallang_mod.xml
similarity index 100%
rename from dlf/modules/locallang_mod.xml
rename to modules/locallang_mod.xml
diff --git a/dlf/modules/newclient/conf.php b/modules/newclient/conf.php
similarity index 100%
rename from dlf/modules/newclient/conf.php
rename to modules/newclient/conf.php
diff --git a/dlf/modules/newclient/index.php b/modules/newclient/index.php
similarity index 100%
rename from dlf/modules/newclient/index.php
rename to modules/newclient/index.php
diff --git a/dlf/modules/newclient/locallang.xml b/modules/newclient/locallang.xml
similarity index 100%
rename from dlf/modules/newclient/locallang.xml
rename to modules/newclient/locallang.xml
diff --git a/dlf/modules/newclient/locallang_mod.xml b/modules/newclient/locallang_mod.xml
similarity index 100%
rename from dlf/modules/newclient/locallang_mod.xml
rename to modules/newclient/locallang_mod.xml
diff --git a/dlf/modules/newclient/metadata.inc.php b/modules/newclient/metadata.inc.php
similarity index 100%
rename from dlf/modules/newclient/metadata.inc.php
rename to modules/newclient/metadata.inc.php
diff --git a/dlf/modules/newclient/structures.inc.php b/modules/newclient/structures.inc.php
similarity index 100%
rename from dlf/modules/newclient/structures.inc.php
rename to modules/newclient/structures.inc.php
diff --git a/dlf/modules/newclient/template.tmpl b/modules/newclient/template.tmpl
similarity index 100%
rename from dlf/modules/newclient/template.tmpl
rename to modules/newclient/template.tmpl
diff --git a/dlf/plugins/audioplayer/class.tx_dlf_audioplayer.php b/plugins/audioplayer/class.tx_dlf_audioplayer.php
similarity index 100%
rename from dlf/plugins/audioplayer/class.tx_dlf_audioplayer.php
rename to plugins/audioplayer/class.tx_dlf_audioplayer.php
diff --git a/dlf/plugins/audioplayer/flexform.xml b/plugins/audioplayer/flexform.xml
similarity index 100%
rename from dlf/plugins/audioplayer/flexform.xml
rename to plugins/audioplayer/flexform.xml
diff --git a/dlf/plugins/audioplayer/js/tx_dlf_audioplayer.js b/plugins/audioplayer/js/tx_dlf_audioplayer.js
similarity index 100%
rename from dlf/plugins/audioplayer/js/tx_dlf_audioplayer.js
rename to plugins/audioplayer/js/tx_dlf_audioplayer.js
diff --git a/dlf/plugins/audioplayer/locallang.xml b/plugins/audioplayer/locallang.xml
similarity index 100%
rename from dlf/plugins/audioplayer/locallang.xml
rename to plugins/audioplayer/locallang.xml
diff --git a/dlf/plugins/audioplayer/template.tmpl b/plugins/audioplayer/template.tmpl
similarity index 100%
rename from dlf/plugins/audioplayer/template.tmpl
rename to plugins/audioplayer/template.tmpl
diff --git a/dlf/plugins/basket/class.tx_dlf_basket.php b/plugins/basket/class.tx_dlf_basket.php
similarity index 100%
rename from dlf/plugins/basket/class.tx_dlf_basket.php
rename to plugins/basket/class.tx_dlf_basket.php
diff --git a/dlf/plugins/basket/flexform.xml b/plugins/basket/flexform.xml
similarity index 100%
rename from dlf/plugins/basket/flexform.xml
rename to plugins/basket/flexform.xml
diff --git a/dlf/plugins/basket/locallang.xml b/plugins/basket/locallang.xml
similarity index 100%
rename from dlf/plugins/basket/locallang.xml
rename to plugins/basket/locallang.xml
diff --git a/dlf/plugins/basket/template.tmpl b/plugins/basket/template.tmpl
similarity index 100%
rename from dlf/plugins/basket/template.tmpl
rename to plugins/basket/template.tmpl
diff --git a/dlf/plugins/collection/class.tx_dlf_collection.php b/plugins/collection/class.tx_dlf_collection.php
similarity index 100%
rename from dlf/plugins/collection/class.tx_dlf_collection.php
rename to plugins/collection/class.tx_dlf_collection.php
diff --git a/dlf/plugins/collection/flexform.xml b/plugins/collection/flexform.xml
similarity index 100%
rename from dlf/plugins/collection/flexform.xml
rename to plugins/collection/flexform.xml
diff --git a/dlf/plugins/collection/locallang.xml b/plugins/collection/locallang.xml
similarity index 100%
rename from dlf/plugins/collection/locallang.xml
rename to plugins/collection/locallang.xml
diff --git a/dlf/plugins/collection/template.tmpl b/plugins/collection/template.tmpl
similarity index 100%
rename from dlf/plugins/collection/template.tmpl
rename to plugins/collection/template.tmpl
diff --git a/dlf/plugins/feeds/class.tx_dlf_feeds.php b/plugins/feeds/class.tx_dlf_feeds.php
similarity index 100%
rename from dlf/plugins/feeds/class.tx_dlf_feeds.php
rename to plugins/feeds/class.tx_dlf_feeds.php
diff --git a/dlf/plugins/feeds/flexform.xml b/plugins/feeds/flexform.xml
similarity index 100%
rename from dlf/plugins/feeds/flexform.xml
rename to plugins/feeds/flexform.xml
diff --git a/dlf/plugins/feeds/locallang.xml b/plugins/feeds/locallang.xml
similarity index 100%
rename from dlf/plugins/feeds/locallang.xml
rename to plugins/feeds/locallang.xml
diff --git a/dlf/plugins/listview/class.tx_dlf_listview.php b/plugins/listview/class.tx_dlf_listview.php
similarity index 100%
rename from dlf/plugins/listview/class.tx_dlf_listview.php
rename to plugins/listview/class.tx_dlf_listview.php
diff --git a/dlf/plugins/listview/flexform.xml b/plugins/listview/flexform.xml
similarity index 100%
rename from dlf/plugins/listview/flexform.xml
rename to plugins/listview/flexform.xml
diff --git a/dlf/plugins/listview/locallang.xml b/plugins/listview/locallang.xml
similarity index 100%
rename from dlf/plugins/listview/locallang.xml
rename to plugins/listview/locallang.xml
diff --git a/dlf/plugins/listview/template.tmpl b/plugins/listview/template.tmpl
similarity index 100%
rename from dlf/plugins/listview/template.tmpl
rename to plugins/listview/template.tmpl
diff --git a/dlf/plugins/metadata/class.tx_dlf_metadata.php b/plugins/metadata/class.tx_dlf_metadata.php
similarity index 100%
rename from dlf/plugins/metadata/class.tx_dlf_metadata.php
rename to plugins/metadata/class.tx_dlf_metadata.php
diff --git a/dlf/plugins/metadata/flexform.xml b/plugins/metadata/flexform.xml
similarity index 100%
rename from dlf/plugins/metadata/flexform.xml
rename to plugins/metadata/flexform.xml
diff --git a/dlf/plugins/metadata/locallang.xml b/plugins/metadata/locallang.xml
similarity index 100%
rename from dlf/plugins/metadata/locallang.xml
rename to plugins/metadata/locallang.xml
diff --git a/dlf/plugins/metadata/template.tmpl b/plugins/metadata/template.tmpl
similarity index 100%
rename from dlf/plugins/metadata/template.tmpl
rename to plugins/metadata/template.tmpl
diff --git a/dlf/plugins/navigation/class.tx_dlf_navigation.php b/plugins/navigation/class.tx_dlf_navigation.php
similarity index 100%
rename from dlf/plugins/navigation/class.tx_dlf_navigation.php
rename to plugins/navigation/class.tx_dlf_navigation.php
diff --git a/dlf/plugins/navigation/flexform.xml b/plugins/navigation/flexform.xml
similarity index 100%
rename from dlf/plugins/navigation/flexform.xml
rename to plugins/navigation/flexform.xml
diff --git a/dlf/plugins/navigation/locallang.xml b/plugins/navigation/locallang.xml
similarity index 100%
rename from dlf/plugins/navigation/locallang.xml
rename to plugins/navigation/locallang.xml
diff --git a/dlf/plugins/navigation/template.tmpl b/plugins/navigation/template.tmpl
similarity index 100%
rename from dlf/plugins/navigation/template.tmpl
rename to plugins/navigation/template.tmpl
diff --git a/dlf/plugins/newspaper/class.tx_dlf_newspaper.php b/plugins/newspaper/class.tx_dlf_newspaper.php
similarity index 100%
rename from dlf/plugins/newspaper/class.tx_dlf_newspaper.php
rename to plugins/newspaper/class.tx_dlf_newspaper.php
diff --git a/dlf/plugins/newspaper/flexform.xml b/plugins/newspaper/flexform.xml
similarity index 100%
rename from dlf/plugins/newspaper/flexform.xml
rename to plugins/newspaper/flexform.xml
diff --git a/dlf/plugins/newspaper/locallang.xml b/plugins/newspaper/locallang.xml
similarity index 100%
rename from dlf/plugins/newspaper/locallang.xml
rename to plugins/newspaper/locallang.xml
diff --git a/dlf/plugins/newspaper/template.tmpl b/plugins/newspaper/template.tmpl
similarity index 100%
rename from dlf/plugins/newspaper/template.tmpl
rename to plugins/newspaper/template.tmpl
diff --git a/dlf/plugins/oai/class.tx_dlf_oai.php b/plugins/oai/class.tx_dlf_oai.php
similarity index 100%
rename from dlf/plugins/oai/class.tx_dlf_oai.php
rename to plugins/oai/class.tx_dlf_oai.php
diff --git a/dlf/plugins/oai/flexform.xml b/plugins/oai/flexform.xml
similarity index 100%
rename from dlf/plugins/oai/flexform.xml
rename to plugins/oai/flexform.xml
diff --git a/dlf/plugins/oai/locallang.xml b/plugins/oai/locallang.xml
similarity index 100%
rename from dlf/plugins/oai/locallang.xml
rename to plugins/oai/locallang.xml
diff --git a/dlf/plugins/oai/transform.xsl b/plugins/oai/transform.xsl
similarity index 100%
rename from dlf/plugins/oai/transform.xsl
rename to plugins/oai/transform.xsl
diff --git a/dlf/plugins/pagegrid/class.tx_dlf_pagegrid.php b/plugins/pagegrid/class.tx_dlf_pagegrid.php
similarity index 100%
rename from dlf/plugins/pagegrid/class.tx_dlf_pagegrid.php
rename to plugins/pagegrid/class.tx_dlf_pagegrid.php
diff --git a/dlf/plugins/pagegrid/flexform.xml b/plugins/pagegrid/flexform.xml
similarity index 100%
rename from dlf/plugins/pagegrid/flexform.xml
rename to plugins/pagegrid/flexform.xml
diff --git a/dlf/plugins/pagegrid/locallang.xml b/plugins/pagegrid/locallang.xml
similarity index 100%
rename from dlf/plugins/pagegrid/locallang.xml
rename to plugins/pagegrid/locallang.xml
diff --git a/dlf/plugins/pagegrid/placeholder.jpg b/plugins/pagegrid/placeholder.jpg
similarity index 100%
rename from dlf/plugins/pagegrid/placeholder.jpg
rename to plugins/pagegrid/placeholder.jpg
diff --git a/dlf/plugins/pagegrid/template.tmpl b/plugins/pagegrid/template.tmpl
similarity index 100%
rename from dlf/plugins/pagegrid/template.tmpl
rename to plugins/pagegrid/template.tmpl
diff --git a/dlf/plugins/pageview/README.md b/plugins/pageview/README.md
similarity index 100%
rename from dlf/plugins/pageview/README.md
rename to plugins/pageview/README.md
diff --git a/dlf/plugins/pageview/class.tx_dlf_geturl_eid.php b/plugins/pageview/class.tx_dlf_geturl_eid.php
similarity index 100%
rename from dlf/plugins/pageview/class.tx_dlf_geturl_eid.php
rename to plugins/pageview/class.tx_dlf_geturl_eid.php
diff --git a/dlf/plugins/pageview/class.tx_dlf_pageview.php b/plugins/pageview/class.tx_dlf_pageview.php
similarity index 100%
rename from dlf/plugins/pageview/class.tx_dlf_pageview.php
rename to plugins/pageview/class.tx_dlf_pageview.php
diff --git a/dlf/plugins/pageview/flexform.xml b/plugins/pageview/flexform.xml
similarity index 100%
rename from dlf/plugins/pageview/flexform.xml
rename to plugins/pageview/flexform.xml
diff --git a/dlf/plugins/pageview/locallang.xml b/plugins/pageview/locallang.xml
similarity index 100%
rename from dlf/plugins/pageview/locallang.xml
rename to plugins/pageview/locallang.xml
diff --git a/dlf/plugins/pageview/package.json b/plugins/pageview/package.json
similarity index 100%
rename from dlf/plugins/pageview/package.json
rename to plugins/pageview/package.json
diff --git a/dlf/plugins/pageview/template.tmpl b/plugins/pageview/template.tmpl
similarity index 100%
rename from dlf/plugins/pageview/template.tmpl
rename to plugins/pageview/template.tmpl
diff --git a/dlf/plugins/pageview/tests/karma.conf.js b/plugins/pageview/tests/karma.conf.js
similarity index 100%
rename from dlf/plugins/pageview/tests/karma.conf.js
rename to plugins/pageview/tests/karma.conf.js
diff --git a/dlf/plugins/pageview/tests/spec/tx_dlf_altoparser.spec.js b/plugins/pageview/tests/spec/tx_dlf_altoparser.spec.js
similarity index 100%
rename from dlf/plugins/pageview/tests/spec/tx_dlf_altoparser.spec.js
rename to plugins/pageview/tests/spec/tx_dlf_altoparser.spec.js
diff --git a/dlf/plugins/pageview/tests/spec/tx_dlf_ol3_source.spec.js b/plugins/pageview/tests/spec/tx_dlf_ol3_source.spec.js
similarity index 100%
rename from dlf/plugins/pageview/tests/spec/tx_dlf_ol3_source.spec.js
rename to plugins/pageview/tests/spec/tx_dlf_ol3_source.spec.js
diff --git a/dlf/plugins/pageview/tests/spec/tx_dlf_utils.spec.js b/plugins/pageview/tests/spec/tx_dlf_utils.spec.js
similarity index 100%
rename from dlf/plugins/pageview/tests/spec/tx_dlf_utils.spec.js
rename to plugins/pageview/tests/spec/tx_dlf_utils.spec.js
diff --git a/dlf/plugins/pageview/tx_dlf_altoparser.js b/plugins/pageview/tx_dlf_altoparser.js
similarity index 100%
rename from dlf/plugins/pageview/tx_dlf_altoparser.js
rename to plugins/pageview/tx_dlf_altoparser.js
diff --git a/dlf/plugins/pageview/tx_dlf_ol3.js b/plugins/pageview/tx_dlf_ol3.js
similarity index 100%
rename from dlf/plugins/pageview/tx_dlf_ol3.js
rename to plugins/pageview/tx_dlf_ol3.js
diff --git a/dlf/plugins/pageview/tx_dlf_ol3_source.js b/plugins/pageview/tx_dlf_ol3_source.js
similarity index 100%
rename from dlf/plugins/pageview/tx_dlf_ol3_source.js
rename to plugins/pageview/tx_dlf_ol3_source.js
diff --git a/dlf/plugins/pageview/tx_dlf_ol3_styles.js b/plugins/pageview/tx_dlf_ol3_styles.js
similarity index 100%
rename from dlf/plugins/pageview/tx_dlf_ol3_styles.js
rename to plugins/pageview/tx_dlf_ol3_styles.js
diff --git a/dlf/plugins/pageview/tx_dlf_pageview.js b/plugins/pageview/tx_dlf_pageview.js
similarity index 100%
rename from dlf/plugins/pageview/tx_dlf_pageview.js
rename to plugins/pageview/tx_dlf_pageview.js
diff --git a/dlf/plugins/pageview/tx_dlf_pageview_fulltext_control.js b/plugins/pageview/tx_dlf_pageview_fulltext_control.js
similarity index 100%
rename from dlf/plugins/pageview/tx_dlf_pageview_fulltext_control.js
rename to plugins/pageview/tx_dlf_pageview_fulltext_control.js
diff --git a/dlf/plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js b/plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js
similarity index 100%
rename from dlf/plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js
rename to plugins/pageview/tx_dlf_pageview_imagemanipulation_control.js
diff --git a/dlf/plugins/pageview/tx_dlf_utils.js b/plugins/pageview/tx_dlf_utils.js
similarity index 100%
rename from dlf/plugins/pageview/tx_dlf_utils.js
rename to plugins/pageview/tx_dlf_utils.js
diff --git a/dlf/plugins/search/class.tx_dlf_search.php b/plugins/search/class.tx_dlf_search.php
similarity index 100%
rename from dlf/plugins/search/class.tx_dlf_search.php
rename to plugins/search/class.tx_dlf_search.php
diff --git a/dlf/plugins/search/class.tx_dlf_search_suggest.php b/plugins/search/class.tx_dlf_search_suggest.php
similarity index 100%
rename from dlf/plugins/search/class.tx_dlf_search_suggest.php
rename to plugins/search/class.tx_dlf_search_suggest.php
diff --git a/dlf/plugins/search/flexform.xml b/plugins/search/flexform.xml
similarity index 100%
rename from dlf/plugins/search/flexform.xml
rename to plugins/search/flexform.xml
diff --git a/dlf/plugins/search/locallang.xml b/plugins/search/locallang.xml
similarity index 100%
rename from dlf/plugins/search/locallang.xml
rename to plugins/search/locallang.xml
diff --git a/dlf/plugins/search/setup.txt b/plugins/search/setup.txt
similarity index 100%
rename from dlf/plugins/search/setup.txt
rename to plugins/search/setup.txt
diff --git a/dlf/plugins/search/template.tmpl b/plugins/search/template.tmpl
similarity index 100%
rename from dlf/plugins/search/template.tmpl
rename to plugins/search/template.tmpl
diff --git a/dlf/plugins/search/tx_dlf_search_suggest.js b/plugins/search/tx_dlf_search_suggest.js
similarity index 100%
rename from dlf/plugins/search/tx_dlf_search_suggest.js
rename to plugins/search/tx_dlf_search_suggest.js
diff --git a/dlf/plugins/statistics/class.tx_dlf_statistics.php b/plugins/statistics/class.tx_dlf_statistics.php
similarity index 100%
rename from dlf/plugins/statistics/class.tx_dlf_statistics.php
rename to plugins/statistics/class.tx_dlf_statistics.php
diff --git a/dlf/plugins/statistics/flexform.xml b/plugins/statistics/flexform.xml
similarity index 100%
rename from dlf/plugins/statistics/flexform.xml
rename to plugins/statistics/flexform.xml
diff --git a/dlf/plugins/statistics/locallang.xml b/plugins/statistics/locallang.xml
similarity index 100%
rename from dlf/plugins/statistics/locallang.xml
rename to plugins/statistics/locallang.xml
diff --git a/dlf/plugins/toc/class.tx_dlf_toc.php b/plugins/toc/class.tx_dlf_toc.php
similarity index 100%
rename from dlf/plugins/toc/class.tx_dlf_toc.php
rename to plugins/toc/class.tx_dlf_toc.php
diff --git a/dlf/plugins/toc/flexform.xml b/plugins/toc/flexform.xml
similarity index 100%
rename from dlf/plugins/toc/flexform.xml
rename to plugins/toc/flexform.xml
diff --git a/dlf/plugins/toc/locallang.xml b/plugins/toc/locallang.xml
similarity index 100%
rename from dlf/plugins/toc/locallang.xml
rename to plugins/toc/locallang.xml
diff --git a/dlf/plugins/toc/setup.txt b/plugins/toc/setup.txt
similarity index 100%
rename from dlf/plugins/toc/setup.txt
rename to plugins/toc/setup.txt
diff --git a/dlf/plugins/toc/template.tmpl b/plugins/toc/template.tmpl
similarity index 100%
rename from dlf/plugins/toc/template.tmpl
rename to plugins/toc/template.tmpl
diff --git a/dlf/plugins/toolbox/class.tx_dlf_toolbox.php b/plugins/toolbox/class.tx_dlf_toolbox.php
similarity index 100%
rename from dlf/plugins/toolbox/class.tx_dlf_toolbox.php
rename to plugins/toolbox/class.tx_dlf_toolbox.php
diff --git a/dlf/plugins/toolbox/flexform.xml b/plugins/toolbox/flexform.xml
similarity index 100%
rename from dlf/plugins/toolbox/flexform.xml
rename to plugins/toolbox/flexform.xml
diff --git a/dlf/plugins/toolbox/locallang.xml b/plugins/toolbox/locallang.xml
similarity index 100%
rename from dlf/plugins/toolbox/locallang.xml
rename to plugins/toolbox/locallang.xml
diff --git a/dlf/plugins/toolbox/template.tmpl b/plugins/toolbox/template.tmpl
similarity index 100%
rename from dlf/plugins/toolbox/template.tmpl
rename to plugins/toolbox/template.tmpl
diff --git a/dlf/plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php b/plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php
similarity index 100%
rename from dlf/plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php
rename to plugins/toolbox/tools/fulltext/class.tx_dlf_toolsFulltext.php
diff --git a/dlf/plugins/toolbox/tools/fulltext/locallang.xml b/plugins/toolbox/tools/fulltext/locallang.xml
similarity index 100%
rename from dlf/plugins/toolbox/tools/fulltext/locallang.xml
rename to plugins/toolbox/tools/fulltext/locallang.xml
diff --git a/dlf/plugins/toolbox/tools/fulltext/template.tmpl b/plugins/toolbox/tools/fulltext/template.tmpl
similarity index 100%
rename from dlf/plugins/toolbox/tools/fulltext/template.tmpl
rename to plugins/toolbox/tools/fulltext/template.tmpl
diff --git a/dlf/plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php b/plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php
similarity index 100%
rename from dlf/plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php
rename to plugins/toolbox/tools/imagedownload/class.tx_dlf_toolsImagedownload.php
diff --git a/dlf/plugins/toolbox/tools/imagedownload/locallang.xml b/plugins/toolbox/tools/imagedownload/locallang.xml
similarity index 100%
rename from dlf/plugins/toolbox/tools/imagedownload/locallang.xml
rename to plugins/toolbox/tools/imagedownload/locallang.xml
diff --git a/dlf/plugins/toolbox/tools/imagedownload/template.tmpl b/plugins/toolbox/tools/imagedownload/template.tmpl
similarity index 100%
rename from dlf/plugins/toolbox/tools/imagedownload/template.tmpl
rename to plugins/toolbox/tools/imagedownload/template.tmpl
diff --git a/dlf/plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php b/plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php
similarity index 100%
rename from dlf/plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php
rename to plugins/toolbox/tools/imagemanipulation/class.tx_dlf_toolsImagemanipulation.php
diff --git a/dlf/plugins/toolbox/tools/imagemanipulation/locallang.xml b/plugins/toolbox/tools/imagemanipulation/locallang.xml
similarity index 100%
rename from dlf/plugins/toolbox/tools/imagemanipulation/locallang.xml
rename to plugins/toolbox/tools/imagemanipulation/locallang.xml
diff --git a/dlf/plugins/toolbox/tools/imagemanipulation/template.tmpl b/plugins/toolbox/tools/imagemanipulation/template.tmpl
similarity index 100%
rename from dlf/plugins/toolbox/tools/imagemanipulation/template.tmpl
rename to plugins/toolbox/tools/imagemanipulation/template.tmpl
diff --git a/dlf/plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php b/plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php
similarity index 100%
rename from dlf/plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php
rename to plugins/toolbox/tools/pdf/class.tx_dlf_toolsPdf.php
diff --git a/dlf/plugins/toolbox/tools/pdf/locallang.xml b/plugins/toolbox/tools/pdf/locallang.xml
similarity index 100%
rename from dlf/plugins/toolbox/tools/pdf/locallang.xml
rename to plugins/toolbox/tools/pdf/locallang.xml
diff --git a/dlf/plugins/toolbox/tools/pdf/template.tmpl b/plugins/toolbox/tools/pdf/template.tmpl
similarity index 100%
rename from dlf/plugins/toolbox/tools/pdf/template.tmpl
rename to plugins/toolbox/tools/pdf/template.tmpl
diff --git a/dlf/plugins/validator/class.tx_dlf_validator.php b/plugins/validator/class.tx_dlf_validator.php
similarity index 100%
rename from dlf/plugins/validator/class.tx_dlf_validator.php
rename to plugins/validator/class.tx_dlf_validator.php
diff --git a/dlf/plugins/validator/flexform.xml b/plugins/validator/flexform.xml
similarity index 100%
rename from dlf/plugins/validator/flexform.xml
rename to plugins/validator/flexform.xml
diff --git a/dlf/plugins/validator/locallang.xml b/plugins/validator/locallang.xml
similarity index 100%
rename from dlf/plugins/validator/locallang.xml
rename to plugins/validator/locallang.xml
diff --git a/dlf/plugins/validator/template.tmpl b/plugins/validator/template.tmpl
similarity index 100%
rename from dlf/plugins/validator/template.tmpl
rename to plugins/validator/template.tmpl
diff --git a/dlf/res/backend.css b/res/backend.css
similarity index 100%
rename from dlf/res/backend.css
rename to res/backend.css
diff --git a/dlf/res/icons/LICENSE.txt b/res/icons/LICENSE.txt
similarity index 100%
rename from dlf/res/icons/LICENSE.txt
rename to res/icons/LICENSE.txt
diff --git a/dlf/res/icons/NOTICE.txt b/res/icons/NOTICE.txt
similarity index 100%
rename from dlf/res/icons/NOTICE.txt
rename to res/icons/NOTICE.txt
diff --git a/dlf/res/icons/txdlfcollections.png b/res/icons/txdlfcollections.png
similarity index 100%
rename from dlf/res/icons/txdlfcollections.png
rename to res/icons/txdlfcollections.png
diff --git a/dlf/res/icons/txdlfdocuments.png b/res/icons/txdlfdocuments.png
similarity index 100%
rename from dlf/res/icons/txdlfdocuments.png
rename to res/icons/txdlfdocuments.png
diff --git a/dlf/res/icons/txdlffeeds.png b/res/icons/txdlffeeds.png
similarity index 100%
rename from dlf/res/icons/txdlffeeds.png
rename to res/icons/txdlffeeds.png
diff --git a/dlf/res/icons/txdlfformats.png b/res/icons/txdlfformats.png
similarity index 100%
rename from dlf/res/icons/txdlfformats.png
rename to res/icons/txdlfformats.png
diff --git a/dlf/res/icons/txdlfindexing.png b/res/icons/txdlfindexing.png
similarity index 100%
rename from dlf/res/icons/txdlfindexing.png
rename to res/icons/txdlfindexing.png
diff --git a/dlf/res/icons/txdlflibraries.png b/res/icons/txdlflibraries.png
similarity index 100%
rename from dlf/res/icons/txdlflibraries.png
rename to res/icons/txdlflibraries.png
diff --git a/dlf/res/icons/txdlfmetadata.png b/res/icons/txdlfmetadata.png
similarity index 100%
rename from dlf/res/icons/txdlfmetadata.png
rename to res/icons/txdlfmetadata.png
diff --git a/dlf/res/icons/txdlfmodules.png b/res/icons/txdlfmodules.png
similarity index 100%
rename from dlf/res/icons/txdlfmodules.png
rename to res/icons/txdlfmodules.png
diff --git a/dlf/res/icons/txdlfnewclient.png b/res/icons/txdlfnewclient.png
similarity index 100%
rename from dlf/res/icons/txdlfnewclient.png
rename to res/icons/txdlfnewclient.png
diff --git a/dlf/res/icons/txdlfsolrcores.png b/res/icons/txdlfsolrcores.png
similarity index 100%
rename from dlf/res/icons/txdlfsolrcores.png
rename to res/icons/txdlfsolrcores.png
diff --git a/dlf/res/icons/txdlfstructures.png b/res/icons/txdlfstructures.png
similarity index 100%
rename from dlf/res/icons/txdlfstructures.png
rename to res/icons/txdlfstructures.png