From f97c89c1f2cc407d6975f2619f24dd1d37224b5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=C3=B6rg=20Lenhard?= <lenhard@users.noreply.github.com>
Date: Fri, 15 Jul 2016 16:42:43 +0200
Subject: [PATCH] Move bst package to logic (#1587)

* Move bst package into logic

* Set new location of bst package for antlr

* Add changelog entry

* Reformulate changelog entry
---
 CHANGELOG.md                                           |  1 +
 build.gradle                                           |  6 +++---
 src/main/antlr3/net/sf/jabref/bst/Bst.g                |  4 ++--
 .../sf/jabref/{ => logic}/bst/BibtexCaseChanger.java   |  2 +-
 .../sf/jabref/{ => logic}/bst/BibtexNameFormatter.java |  2 +-
 .../net/sf/jabref/{ => logic}/bst/BibtexPurify.java    |  2 +-
 .../sf/jabref/{ => logic}/bst/BibtexTextPrefix.java    |  2 +-
 .../net/sf/jabref/{ => logic}/bst/BibtexWidth.java     |  2 +-
 .../sf/jabref/{ => logic}/bst/ChangeCaseFunction.java  |  8 ++++----
 .../sf/jabref/{ => logic}/bst/FormatNameFunction.java  |  6 +++---
 .../net/sf/jabref/{ => logic}/bst/PurifyFunction.java  |  6 +++---
 .../sf/jabref/{ => logic}/bst/TextPrefixFunction.java  |  6 +++---
 src/main/java/net/sf/jabref/{ => logic}/bst/VM.java    |  2 +-
 .../net/sf/jabref/{ => logic}/bst/VMException.java     |  2 +-
 src/main/java/net/sf/jabref/{ => logic}/bst/Warn.java  |  2 +-
 .../net/sf/jabref/{ => logic}/bst/WidthFunction.java   |  6 +++---
 .../sf/jabref/logic/layout/format/NameFormatter.java   |  2 +-
 .../jabref/{ => logic}/bst/BibtexCaseChangersTest.java |  4 ++--
 .../{ => logic}/bst/BibtexNameFormatterTest.java       |  2 +-
 .../sf/jabref/{ => logic}/bst/BibtexPurifyTest.java    |  2 +-
 .../net/sf/jabref/{ => logic}/bst/BibtexWidthTest.java |  2 +-
 .../java/net/sf/jabref/{ => logic}/bst/TestVM.java     | 10 +++++-----
 .../jabref/{ => logic}/bst/TextPrefixFunctionTest.java |  2 +-
 .../resources/net/sf/jabref/{ => logic}/bst/abbrv.bst  |  0
 24 files changed, 42 insertions(+), 41 deletions(-)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/BibtexCaseChanger.java (99%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/BibtexNameFormatter.java (99%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/BibtexPurify.java (99%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/BibtexTextPrefix.java (98%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/BibtexWidth.java (99%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/ChangeCaseFunction.java (94%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/FormatNameFunction.java (95%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/PurifyFunction.java (93%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/TextPrefixFunction.java (95%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/VM.java (99%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/VMException.java (96%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/Warn.java (96%)
 rename src/main/java/net/sf/jabref/{ => logic}/bst/WidthFunction.java (94%)
 rename src/test/java/net/sf/jabref/{ => logic}/bst/BibtexCaseChangersTest.java (98%)
 rename src/test/java/net/sf/jabref/{ => logic}/bst/BibtexNameFormatterTest.java (99%)
 rename src/test/java/net/sf/jabref/{ => logic}/bst/BibtexPurifyTest.java (96%)
 rename src/test/java/net/sf/jabref/{ => logic}/bst/BibtexWidthTest.java (98%)
 rename src/test/java/net/sf/jabref/{ => logic}/bst/TestVM.java (99%)
 rename src/test/java/net/sf/jabref/{ => logic}/bst/TextPrefixFunctionTest.java (96%)
 rename src/test/resources/net/sf/jabref/{ => logic}/bst/abbrv.bst (100%)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e509fb999a..2f82dcd1dd1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -12,6 +12,7 @@ We refer to [GitHub issues](https://github.com/JabRef/jabref/issues) by using `#
 ## [Unreleased]
 
 ### Changed
+- For developers: Moved the bst package into logic. This requires the regeneration of antlr sources, execute: gradlew generateSource
 - [#1026](https://github.com/JabRef/jabref/issues/1026) JabRef does no longer delete user comments outside of BibTeX entries and strings
 - [#1249](https://github.com/JabRef/jabref/issues/1249) Date layout formatter added
 
diff --git a/build.gradle b/build.gradle
index fb8046e13c0..cfdea1659bb 100644
--- a/build.gradle
+++ b/build.gradle
@@ -164,12 +164,12 @@ task generateBstGrammarSource(type: JavaExec) {
     File antlrSource = file('src/main/antlr3/net/sf/jabref/bst/Bst.g')
 
     inputs.file antlrSource
-    outputs.file file('src/main/gen/net/sf/jabref/bst/BstLexer.java')
-    outputs.file file('src/main/gen/net/sf/jabref/bst/BstParser.java')
+    outputs.file file('src/main/gen/net/sf/jabref/logic/bst/BstLexer.java')
+    outputs.file file('src/main/gen/net/sf/jabref/logic/bst/BstParser.java')
 
     main = 'org.antlr.Tool'
     classpath = configurations.antlr3
-    args = ["-o", file('src/main/gen/net/sf/jabref/bst/'), antlrSource]
+    args = ["-o", file('src/main/gen/net/sf/jabref/logic/bst/'), antlrSource]
 }
 
 task generateSearchGrammarSource(type: JavaExec) {
diff --git a/src/main/antlr3/net/sf/jabref/bst/Bst.g b/src/main/antlr3/net/sf/jabref/bst/Bst.g
index 9784d9f86a8..bcfd1d305d2 100644
--- a/src/main/antlr3/net/sf/jabref/bst/Bst.g
+++ b/src/main/antlr3/net/sf/jabref/bst/Bst.g
@@ -13,11 +13,11 @@ tokens {
 
 // applies only to the parser:
 @header {// Generated by ANTLR
-package net.sf.jabref.bst;}
+package net.sf.jabref.logic.bst;}
 
 // applies only to the lexer:
 @lexer::header {// Generated by ANTLR
-package net.sf.jabref.bst;}
+package net.sf.jabref.logic.bst;}
 
 program : commands+ -> ^(COMMANDS commands+);
 
diff --git a/src/main/java/net/sf/jabref/bst/BibtexCaseChanger.java b/src/main/java/net/sf/jabref/logic/bst/BibtexCaseChanger.java
similarity index 99%
rename from src/main/java/net/sf/jabref/bst/BibtexCaseChanger.java
rename to src/main/java/net/sf/jabref/logic/bst/BibtexCaseChanger.java
index 33784b7d60f..5f4deaaae67 100644
--- a/src/main/java/net/sf/jabref/bst/BibtexCaseChanger.java
+++ b/src/main/java/net/sf/jabref/logic/bst/BibtexCaseChanger.java
@@ -13,7 +13,7 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.util.Optional;
 
diff --git a/src/main/java/net/sf/jabref/bst/BibtexNameFormatter.java b/src/main/java/net/sf/jabref/logic/bst/BibtexNameFormatter.java
similarity index 99%
rename from src/main/java/net/sf/jabref/bst/BibtexNameFormatter.java
rename to src/main/java/net/sf/jabref/logic/bst/BibtexNameFormatter.java
index 5fe2f2d2c61..33408aed066 100644
--- a/src/main/java/net/sf/jabref/bst/BibtexNameFormatter.java
+++ b/src/main/java/net/sf/jabref/logic/bst/BibtexNameFormatter.java
@@ -13,7 +13,7 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.util.Arrays;
 import java.util.stream.Collectors;
diff --git a/src/main/java/net/sf/jabref/bst/BibtexPurify.java b/src/main/java/net/sf/jabref/logic/bst/BibtexPurify.java
similarity index 99%
rename from src/main/java/net/sf/jabref/bst/BibtexPurify.java
rename to src/main/java/net/sf/jabref/logic/bst/BibtexPurify.java
index c0184157976..6d231c6a26f 100644
--- a/src/main/java/net/sf/jabref/bst/BibtexPurify.java
+++ b/src/main/java/net/sf/jabref/logic/bst/BibtexPurify.java
@@ -14,7 +14,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 // $Id$
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 /**
  *
diff --git a/src/main/java/net/sf/jabref/bst/BibtexTextPrefix.java b/src/main/java/net/sf/jabref/logic/bst/BibtexTextPrefix.java
similarity index 98%
rename from src/main/java/net/sf/jabref/bst/BibtexTextPrefix.java
rename to src/main/java/net/sf/jabref/logic/bst/BibtexTextPrefix.java
index be7cddaa0bd..60820ff8230 100644
--- a/src/main/java/net/sf/jabref/bst/BibtexTextPrefix.java
+++ b/src/main/java/net/sf/jabref/logic/bst/BibtexTextPrefix.java
@@ -14,7 +14,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 // $Id$
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 /**
  * The |built_in| function {\.{text.prefix\$}} pops the top two literals (the
diff --git a/src/main/java/net/sf/jabref/bst/BibtexWidth.java b/src/main/java/net/sf/jabref/logic/bst/BibtexWidth.java
similarity index 99%
rename from src/main/java/net/sf/jabref/bst/BibtexWidth.java
rename to src/main/java/net/sf/jabref/logic/bst/BibtexWidth.java
index f50904bcc64..19ad61eb126 100644
--- a/src/main/java/net/sf/jabref/bst/BibtexWidth.java
+++ b/src/main/java/net/sf/jabref/logic/bst/BibtexWidth.java
@@ -14,7 +14,7 @@
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
 // $Id$
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/src/main/java/net/sf/jabref/bst/ChangeCaseFunction.java b/src/main/java/net/sf/jabref/logic/bst/ChangeCaseFunction.java
similarity index 94%
rename from src/main/java/net/sf/jabref/bst/ChangeCaseFunction.java
rename to src/main/java/net/sf/jabref/logic/bst/ChangeCaseFunction.java
index b46e962ac74..86ec3fa0950 100644
--- a/src/main/java/net/sf/jabref/bst/ChangeCaseFunction.java
+++ b/src/main/java/net/sf/jabref/logic/bst/ChangeCaseFunction.java
@@ -13,13 +13,13 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.util.Stack;
 
-import net.sf.jabref.bst.BibtexCaseChanger.FORMAT_MODE;
-import net.sf.jabref.bst.VM.BstEntry;
-import net.sf.jabref.bst.VM.BstFunction;
+import net.sf.jabref.logic.bst.BibtexCaseChanger.FORMAT_MODE;
+import net.sf.jabref.logic.bst.VM.BstEntry;
+import net.sf.jabref.logic.bst.VM.BstFunction;
 
 /**
  * From the Bibtex manual:
diff --git a/src/main/java/net/sf/jabref/bst/FormatNameFunction.java b/src/main/java/net/sf/jabref/logic/bst/FormatNameFunction.java
similarity index 95%
rename from src/main/java/net/sf/jabref/bst/FormatNameFunction.java
rename to src/main/java/net/sf/jabref/logic/bst/FormatNameFunction.java
index 9a58ea6221d..6f81677f1c0 100644
--- a/src/main/java/net/sf/jabref/bst/FormatNameFunction.java
+++ b/src/main/java/net/sf/jabref/logic/bst/FormatNameFunction.java
@@ -13,12 +13,12 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.util.Stack;
 
-import net.sf.jabref.bst.VM.BstEntry;
-import net.sf.jabref.bst.VM.BstFunction;
+import net.sf.jabref.logic.bst.VM.BstEntry;
+import net.sf.jabref.logic.bst.VM.BstFunction;
 import net.sf.jabref.model.entry.Author;
 import net.sf.jabref.model.entry.AuthorList;
 
diff --git a/src/main/java/net/sf/jabref/bst/PurifyFunction.java b/src/main/java/net/sf/jabref/logic/bst/PurifyFunction.java
similarity index 93%
rename from src/main/java/net/sf/jabref/bst/PurifyFunction.java
rename to src/main/java/net/sf/jabref/logic/bst/PurifyFunction.java
index f6765e8a61d..f5ca1f34219 100644
--- a/src/main/java/net/sf/jabref/bst/PurifyFunction.java
+++ b/src/main/java/net/sf/jabref/logic/bst/PurifyFunction.java
@@ -13,12 +13,12 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.util.Stack;
 
-import net.sf.jabref.bst.VM.BstEntry;
-import net.sf.jabref.bst.VM.BstFunction;
+import net.sf.jabref.logic.bst.VM.BstEntry;
+import net.sf.jabref.logic.bst.VM.BstFunction;
 
 /**
  *
diff --git a/src/main/java/net/sf/jabref/bst/TextPrefixFunction.java b/src/main/java/net/sf/jabref/logic/bst/TextPrefixFunction.java
similarity index 95%
rename from src/main/java/net/sf/jabref/bst/TextPrefixFunction.java
rename to src/main/java/net/sf/jabref/logic/bst/TextPrefixFunction.java
index 9b10d34ed95..910041d73a0 100644
--- a/src/main/java/net/sf/jabref/bst/TextPrefixFunction.java
+++ b/src/main/java/net/sf/jabref/logic/bst/TextPrefixFunction.java
@@ -13,12 +13,12 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.util.Stack;
 
-import net.sf.jabref.bst.VM.BstEntry;
-import net.sf.jabref.bst.VM.BstFunction;
+import net.sf.jabref.logic.bst.VM.BstEntry;
+import net.sf.jabref.logic.bst.VM.BstFunction;
 
 /**
  The |built_in| function {\.{text.prefix\$}} pops the top two literals
diff --git a/src/main/java/net/sf/jabref/bst/VM.java b/src/main/java/net/sf/jabref/logic/bst/VM.java
similarity index 99%
rename from src/main/java/net/sf/jabref/bst/VM.java
rename to src/main/java/net/sf/jabref/logic/bst/VM.java
index 0d97dd27bbd..a5722551a46 100644
--- a/src/main/java/net/sf/jabref/bst/VM.java
+++ b/src/main/java/net/sf/jabref/logic/bst/VM.java
@@ -13,7 +13,7 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.io.File;
 import java.io.IOException;
diff --git a/src/main/java/net/sf/jabref/bst/VMException.java b/src/main/java/net/sf/jabref/logic/bst/VMException.java
similarity index 96%
rename from src/main/java/net/sf/jabref/bst/VMException.java
rename to src/main/java/net/sf/jabref/logic/bst/VMException.java
index 5fada27bed9..7d6ca86d089 100644
--- a/src/main/java/net/sf/jabref/bst/VMException.java
+++ b/src/main/java/net/sf/jabref/logic/bst/VMException.java
@@ -13,7 +13,7 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 public class VMException extends RuntimeException {
 
diff --git a/src/main/java/net/sf/jabref/bst/Warn.java b/src/main/java/net/sf/jabref/logic/bst/Warn.java
similarity index 96%
rename from src/main/java/net/sf/jabref/bst/Warn.java
rename to src/main/java/net/sf/jabref/logic/bst/Warn.java
index 6af03a7fca7..98f095ab322 100644
--- a/src/main/java/net/sf/jabref/bst/Warn.java
+++ b/src/main/java/net/sf/jabref/logic/bst/Warn.java
@@ -13,7 +13,7 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 @FunctionalInterface
 public interface Warn {
diff --git a/src/main/java/net/sf/jabref/bst/WidthFunction.java b/src/main/java/net/sf/jabref/logic/bst/WidthFunction.java
similarity index 94%
rename from src/main/java/net/sf/jabref/bst/WidthFunction.java
rename to src/main/java/net/sf/jabref/logic/bst/WidthFunction.java
index 1b23a65794d..35b5da295f1 100644
--- a/src/main/java/net/sf/jabref/bst/WidthFunction.java
+++ b/src/main/java/net/sf/jabref/logic/bst/WidthFunction.java
@@ -13,12 +13,12 @@
     with this program; if not, write to the Free Software Foundation, Inc.,
     51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 */
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.util.Stack;
 
-import net.sf.jabref.bst.VM.BstEntry;
-import net.sf.jabref.bst.VM.BstFunction;
+import net.sf.jabref.logic.bst.VM.BstEntry;
+import net.sf.jabref.logic.bst.VM.BstFunction;
 
 /**
  * The |built_in| function {\.{width\$}} pops the top (string) literal and
diff --git a/src/main/java/net/sf/jabref/logic/layout/format/NameFormatter.java b/src/main/java/net/sf/jabref/logic/layout/format/NameFormatter.java
index e1abc5913a1..5f781287662 100644
--- a/src/main/java/net/sf/jabref/logic/layout/format/NameFormatter.java
+++ b/src/main/java/net/sf/jabref/logic/layout/format/NameFormatter.java
@@ -20,7 +20,7 @@
 import java.util.Map;
 
 import net.sf.jabref.Globals;
-import net.sf.jabref.bst.BibtexNameFormatter;
+import net.sf.jabref.logic.bst.BibtexNameFormatter;
 import net.sf.jabref.logic.layout.LayoutFormatter;
 import net.sf.jabref.model.entry.AuthorList;
 
diff --git a/src/test/java/net/sf/jabref/bst/BibtexCaseChangersTest.java b/src/test/java/net/sf/jabref/logic/bst/BibtexCaseChangersTest.java
similarity index 98%
rename from src/test/java/net/sf/jabref/bst/BibtexCaseChangersTest.java
rename to src/test/java/net/sf/jabref/logic/bst/BibtexCaseChangersTest.java
index 262015e52f8..b1388de694a 100644
--- a/src/test/java/net/sf/jabref/bst/BibtexCaseChangersTest.java
+++ b/src/test/java/net/sf/jabref/logic/bst/BibtexCaseChangersTest.java
@@ -1,6 +1,6 @@
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
-import net.sf.jabref.bst.BibtexCaseChanger.FORMAT_MODE;
+import net.sf.jabref.logic.bst.BibtexCaseChanger.FORMAT_MODE;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/net/sf/jabref/bst/BibtexNameFormatterTest.java b/src/test/java/net/sf/jabref/logic/bst/BibtexNameFormatterTest.java
similarity index 99%
rename from src/test/java/net/sf/jabref/bst/BibtexNameFormatterTest.java
rename to src/test/java/net/sf/jabref/logic/bst/BibtexNameFormatterTest.java
index 01b74739fc6..56100dd3cd6 100644
--- a/src/test/java/net/sf/jabref/bst/BibtexNameFormatterTest.java
+++ b/src/test/java/net/sf/jabref/logic/bst/BibtexNameFormatterTest.java
@@ -1,4 +1,4 @@
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import net.sf.jabref.model.entry.AuthorList;
 
diff --git a/src/test/java/net/sf/jabref/bst/BibtexPurifyTest.java b/src/test/java/net/sf/jabref/logic/bst/BibtexPurifyTest.java
similarity index 96%
rename from src/test/java/net/sf/jabref/bst/BibtexPurifyTest.java
rename to src/test/java/net/sf/jabref/logic/bst/BibtexPurifyTest.java
index 95756761c9f..48ea2d915dc 100644
--- a/src/test/java/net/sf/jabref/bst/BibtexPurifyTest.java
+++ b/src/test/java/net/sf/jabref/logic/bst/BibtexPurifyTest.java
@@ -1,4 +1,4 @@
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/net/sf/jabref/bst/BibtexWidthTest.java b/src/test/java/net/sf/jabref/logic/bst/BibtexWidthTest.java
similarity index 98%
rename from src/test/java/net/sf/jabref/bst/BibtexWidthTest.java
rename to src/test/java/net/sf/jabref/logic/bst/BibtexWidthTest.java
index 1f42d01f37a..c14533c5bcd 100644
--- a/src/test/java/net/sf/jabref/bst/BibtexWidthTest.java
+++ b/src/test/java/net/sf/jabref/logic/bst/BibtexWidthTest.java
@@ -1,4 +1,4 @@
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/java/net/sf/jabref/bst/TestVM.java b/src/test/java/net/sf/jabref/logic/bst/TestVM.java
similarity index 99%
rename from src/test/java/net/sf/jabref/bst/TestVM.java
rename to src/test/java/net/sf/jabref/logic/bst/TestVM.java
index 0f1286d28d2..a63da63f73b 100644
--- a/src/test/java/net/sf/jabref/bst/TestVM.java
+++ b/src/test/java/net/sf/jabref/logic/bst/TestVM.java
@@ -1,4 +1,4 @@
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import java.io.File;
 import java.io.IOException;
@@ -9,10 +9,10 @@
 
 import net.sf.jabref.Globals;
 import net.sf.jabref.JabRefPreferences;
-import net.sf.jabref.bst.VM.BstEntry;
-import net.sf.jabref.bst.VM.StackFunction;
 import net.sf.jabref.importer.ParserResult;
 import net.sf.jabref.importer.fileformat.BibtexParser;
+import net.sf.jabref.logic.bst.VM.BstEntry;
+import net.sf.jabref.logic.bst.VM.StackFunction;
 import net.sf.jabref.model.entry.BibEntry;
 
 import org.antlr.runtime.RecognitionException;
@@ -30,7 +30,7 @@ public void setPreferences() {
 
     @Test
     public void testAbbrv() throws RecognitionException, IOException {
-        VM vm = new VM(new File("src/test/resources/net/sf/jabref/bst/abbrv.bst"));
+        VM vm = new VM(new File("src/test/resources/net/sf/jabref/logic/bst/abbrv.bst"));
         List<BibEntry> v = new ArrayList<>();
         v.add(t1BibtexEntry());
 
@@ -664,7 +664,7 @@ private String t1BibtexString() {
 
     @Test
     public void testHypthenatedName() throws RecognitionException, IOException {
-        VM vm = new VM(new File("src/test/resources/net/sf/jabref/bst/abbrv.bst"));
+        VM vm = new VM(new File("src/test/resources/net/sf/jabref/logic/bst/abbrv.bst"));
         List<BibEntry> v = new ArrayList<>();
         v.add(TestVM.bibtexString2BibtexEntry("@article{canh05, author = \"Jean-Paul Sartre\" }"));
         Assert.assertTrue(vm.run(v).contains("J.-P. Sartre"));
diff --git a/src/test/java/net/sf/jabref/bst/TextPrefixFunctionTest.java b/src/test/java/net/sf/jabref/logic/bst/TextPrefixFunctionTest.java
similarity index 96%
rename from src/test/java/net/sf/jabref/bst/TextPrefixFunctionTest.java
rename to src/test/java/net/sf/jabref/logic/bst/TextPrefixFunctionTest.java
index d24601cf6ef..02c908b5a2d 100644
--- a/src/test/java/net/sf/jabref/bst/TextPrefixFunctionTest.java
+++ b/src/test/java/net/sf/jabref/logic/bst/TextPrefixFunctionTest.java
@@ -1,4 +1,4 @@
-package net.sf.jabref.bst;
+package net.sf.jabref.logic.bst;
 
 import org.junit.Assert;
 import org.junit.Test;
diff --git a/src/test/resources/net/sf/jabref/bst/abbrv.bst b/src/test/resources/net/sf/jabref/logic/bst/abbrv.bst
similarity index 100%
rename from src/test/resources/net/sf/jabref/bst/abbrv.bst
rename to src/test/resources/net/sf/jabref/logic/bst/abbrv.bst