diff --git a/bibtexbrowser-cli.php b/bin/bibtexbrowser-cli.php
similarity index 100%
rename from bibtexbrowser-cli.php
rename to bin/bibtexbrowser-cli.php
diff --git a/bibtexbrowser.php b/src/bibtexbrowser.php
similarity index 100%
rename from bibtexbrowser.php
rename to src/bibtexbrowser.php
diff --git a/bibacid-utf8.bib b/tests/bibacid-utf8.bib
similarity index 100%
rename from bibacid-utf8.bib
rename to tests/bibacid-utf8.bib
diff --git a/bibtexbrowser-test.php b/tests/bibtexbrowser-test.php
similarity index 100%
rename from bibtexbrowser-test.php
rename to tests/bibtexbrowser-test.php
diff --git a/bibtexbrowser-documentation.wiki b/wiki/bibtexbrowser-documentation.wiki
similarity index 100%
rename from bibtexbrowser-documentation.wiki
rename to wiki/bibtexbrowser-documentation.wiki
diff --git a/bibtexbrowser-users.wiki b/wiki/bibtexbrowser-users.wiki
similarity index 100%
rename from bibtexbrowser-users.wiki
rename to wiki/bibtexbrowser-users.wiki