More around files into more applicable packages.

core/src/main/java/org/nwapw/abacus/lexing/Lexer.java

@@ -1,9 +1,8 @@
 package org.nwapw.abacus.lexing;
 
-import org.nwapw.abacus.lexing.pattern.EndNode;
-import org.nwapw.abacus.lexing.pattern.Match;
+import org.nwapw.abacus.lexing.pattern.nodes.EndNode;
 import org.nwapw.abacus.lexing.pattern.Pattern;
-import org.nwapw.abacus.lexing.pattern.PatternNode;
+import org.nwapw.abacus.lexing.pattern.nodes.PatternNode;
 
 import java.util.*;
 

core/src/main/java/org/nwapw/abacus/lexing/Match.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern;
+package org.nwapw.abacus.lexing;
 
 /**
  * A match that has been generated by the lexer.

core/src/main/java/org/nwapw/abacus/lexing/pattern/Pattern.java

@@ -1,5 +1,7 @@
 package org.nwapw.abacus.lexing.pattern;
 
+import org.nwapw.abacus.lexing.pattern.nodes.*;
+
 import java.util.Collection;
 import java.util.HashMap;
 import java.util.Map;
@@ -88,7 +90,7 @@ public class Pattern<T> {
      * @return the modified chain.
      */
     private PatternChain<T> transformPlus(PatternChain<T> chain) {
-        chain.tail.outputStates.add(chain.head);
+        chain.tail.getOutputStates().add(chain.head);
         return chain;
     }
 
@@ -102,10 +104,10 @@ public class Pattern<T> {
     private PatternChain<T> transformStar(PatternChain<T> chain) {
         LinkNode<T> newTail = new LinkNode<>();
         LinkNode<T> newHead = new LinkNode<>();
-        newHead.outputStates.add(chain.head);
-        newHead.outputStates.add(newTail);
-        chain.tail.outputStates.add(newTail);
-        newTail.outputStates.add(newHead);
+        newHead.getOutputStates().add(chain.head);
+        newHead.getOutputStates().add(newTail);
+        chain.tail.getOutputStates().add(newTail);
+        newTail.getOutputStates().add(newHead);
         chain.head = newHead;
         chain.tail = newTail;
         return chain;
@@ -121,9 +123,9 @@ public class Pattern<T> {
     private PatternChain<T> transformQuestion(PatternChain<T> chain) {
         LinkNode<T> newTail = new LinkNode<>();
         LinkNode<T> newHead = new LinkNode<>();
-        newHead.outputStates.add(chain.head);
-        newHead.outputStates.add(newTail);
-        chain.tail.outputStates.add(newTail);
+        newHead.getOutputStates().add(chain.head);
+        newHead.getOutputStates().add(newTail);
+        chain.tail.getOutputStates().add(newTail);
         chain.head = newHead;
         chain.tail = newTail;
         return chain;
@@ -140,8 +142,8 @@ public class Pattern<T> {
         LinkNode<T> tail = new LinkNode<>();
         PatternChain<T> newChain = new PatternChain<>(head, tail);
         for (PatternChain<T> chain : collection) {
-            head.outputStates.add(chain.head);
-            chain.tail.outputStates.add(tail);
+            head.getOutputStates().add(chain.head);
+            chain.tail.getOutputStates().add(tail);
         }
         return newChain;
     }

core/src/main/java/org/nwapw/abacus/lexing/pattern/PatternChain.java

@@ -1,5 +1,7 @@
 package org.nwapw.abacus.lexing.pattern;
 
+import org.nwapw.abacus.lexing.pattern.nodes.PatternNode;
+
 /**
  * A chain of nodes that can be treated as a single unit.
  * Used during pattern compilation.
@@ -56,7 +58,7 @@ public class PatternChain<T> {
             this.head = other.head;
             this.tail = other.tail;
         } else {
-            tail.outputStates.add(other.head);
+            tail.getOutputStates().add(other.head);
             tail = other.tail;
         }
     }
@@ -72,7 +74,7 @@ public class PatternChain<T> {
         if (tail == null) {
             head = tail = node;
         } else {
-            tail.outputStates.add(node);
+            tail.getOutputStates().add(node);
             tail = node;
         }
     }

core/src/main/java/org/nwapw/abacus/lexing/pattern/nodes/AnyNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern;
+package org.nwapw.abacus.lexing.pattern.nodes;
 
 /**
  * A pattern node that matches any character.

core/src/main/java/org/nwapw/abacus/lexing/pattern/nodes/EndNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern;
+package org.nwapw.abacus.lexing.pattern.nodes;
 
 /**
  * A node that represents a successful match.

core/src/main/java/org/nwapw/abacus/lexing/pattern/nodes/LinkNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern;
+package org.nwapw.abacus.lexing.pattern.nodes;
 
 import java.util.Collection;
 

core/src/main/java/org/nwapw/abacus/lexing/pattern/nodes/PatternNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern;
+package org.nwapw.abacus.lexing.pattern.nodes;
 
 import java.util.Collection;
 import java.util.HashSet;
@@ -65,4 +65,11 @@ public class PatternNode<T> {
         outputStates.forEach(e -> e.addInto(into));
     }
 
+    /**
+     * Gets the output states of this node.
+     * @return the output states.
+     */
+    public Set<PatternNode<T>> getOutputStates() {
+        return outputStates;
+    }
 }

core/src/main/java/org/nwapw/abacus/lexing/pattern/nodes/RangeNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern;
+package org.nwapw.abacus.lexing.pattern.nodes;
 
 /**
  * A node that matches a range of characters.

core/src/main/java/org/nwapw/abacus/lexing/pattern/nodes/ValueNode.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.lexing.pattern;
+package org.nwapw.abacus.lexing.pattern.nodes;
 
 /**
  * A node that matches a single value.

core/src/main/java/org/nwapw/abacus/number/standard/NaiveNumber.java

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.number;
+package org.nwapw.abacus.number.standard;
+
+import org.nwapw.abacus.number.NumberInterface;
 
 /**
  * An implementation of NumberInterface using a double.

core/src/main/java/org/nwapw/abacus/number/standard/PreciseNumber.java

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.number;
+package org.nwapw.abacus.number.standard;
+
+import org.nwapw.abacus.number.NumberInterface;
 
 import java.math.BigDecimal;
 import java.math.MathContext;

core/src/main/java/org/nwapw/abacus/parsing/standard/LexerTokenizer.java

@@ -1,12 +1,12 @@
-package org.nwapw.abacus.parsing;
+package org.nwapw.abacus.parsing.standard;
 
 import org.nwapw.abacus.exception.TokenizeException;
 import org.nwapw.abacus.lexing.Lexer;
-import org.nwapw.abacus.lexing.pattern.Match;
+import org.nwapw.abacus.lexing.Match;
 import org.nwapw.abacus.lexing.pattern.Pattern;
+import org.nwapw.abacus.parsing.Tokenizer;
 import org.nwapw.abacus.plugin.PluginListener;
 import org.nwapw.abacus.plugin.PluginManager;
-import org.nwapw.abacus.tree.TokenType;
 
 import java.util.Comparator;
 import java.util.List;

core/src/main/java/org/nwapw/abacus/parsing/standard/ShuntingYardParser.java

@@ -1,13 +1,14 @@
-package org.nwapw.abacus.parsing;
+package org.nwapw.abacus.parsing.standard;
 
 import org.nwapw.abacus.exception.ParseException;
 import org.nwapw.abacus.function.Operator;
 import org.nwapw.abacus.function.OperatorAssociativity;
 import org.nwapw.abacus.function.OperatorType;
-import org.nwapw.abacus.lexing.pattern.Match;
+import org.nwapw.abacus.lexing.Match;
+import org.nwapw.abacus.parsing.Parser;
 import org.nwapw.abacus.plugin.PluginListener;
 import org.nwapw.abacus.plugin.PluginManager;
-import org.nwapw.abacus.tree.*;
+import org.nwapw.abacus.tree.nodes.*;
 
 import java.util.*;
 
@@ -162,7 +163,7 @@ public class ShuntingYardParser implements Parser<Match<TokenType>>, PluginListe
             matches.remove(0);
             CallNode node;
             if (matchType == TokenType.FUNCTION) {
-                node = new FunctionNode(functionName, children);
+                node = new NumberFunctionNode(functionName, children);
             } else {
                 node = new TreeValueFunctionNode(functionName, children);
             }

core/src/main/java/org/nwapw/abacus/parsing/standard/TokenType.java

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.tree;
+package org.nwapw.abacus.parsing.standard;
 
 /**
  * Enum to represent the type of the token that has been matched

core/src/main/java/org/nwapw/abacus/plugin/Plugin.java

@@ -1,6 +1,10 @@
 package org.nwapw.abacus.plugin;
 
 import org.nwapw.abacus.function.*;
+import org.nwapw.abacus.function.interfaces.NumberFunction;
+import org.nwapw.abacus.function.interfaces.NumberOperator;
+import org.nwapw.abacus.function.interfaces.TreeValueFunction;
+import org.nwapw.abacus.function.interfaces.TreeValueOperator;
 import org.nwapw.abacus.number.NumberInterface;
 
 /**

core/src/main/java/org/nwapw/abacus/plugin/PluginManager.java

@@ -2,6 +2,10 @@ package org.nwapw.abacus.plugin;
 
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.function.*;
+import org.nwapw.abacus.function.interfaces.NumberFunction;
+import org.nwapw.abacus.function.interfaces.NumberOperator;
+import org.nwapw.abacus.function.interfaces.TreeValueFunction;
+import org.nwapw.abacus.function.interfaces.TreeValueOperator;
 import org.nwapw.abacus.number.NumberInterface;
 
 import java.lang.reflect.InvocationTargetException;

core/src/main/java/org/nwapw/abacus/plugin/standard/StandardPlugin.java

@@ -2,9 +2,12 @@ package org.nwapw.abacus.plugin.standard;
 
 import org.nwapw.abacus.context.MutableEvaluationContext;
 import org.nwapw.abacus.function.*;
-import org.nwapw.abacus.number.NaiveNumber;
+import org.nwapw.abacus.function.interfaces.NumberFunction;
+import org.nwapw.abacus.function.interfaces.NumberOperator;
+import org.nwapw.abacus.function.interfaces.TreeValueOperator;
+import org.nwapw.abacus.number.standard.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.number.PreciseNumber;
+import org.nwapw.abacus.number.standard.PreciseNumber;
 import org.nwapw.abacus.plugin.NumberImplementation;
 import org.nwapw.abacus.plugin.Plugin;
 import org.nwapw.abacus.plugin.PluginManager;

core/src/main/kotlin/org/nwapw/abacus/Abacus.kt

@@ -3,15 +3,14 @@ package org.nwapw.abacus
 import org.nwapw.abacus.config.Configuration
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.context.EvaluationContext
-import org.nwapw.abacus.number.PromotionManager
-import org.nwapw.abacus.parsing.LexerTokenizer
-import org.nwapw.abacus.parsing.ShuntingYardParser
+import org.nwapw.abacus.number.promotion.PromotionManager
+import org.nwapw.abacus.parsing.standard.LexerTokenizer
+import org.nwapw.abacus.parsing.standard.ShuntingYardParser
 import org.nwapw.abacus.parsing.TreeBuilder
 import org.nwapw.abacus.plugin.PluginManager
 import org.nwapw.abacus.plugin.standard.StandardPlugin
-import org.nwapw.abacus.tree.EvaluationResult
-import org.nwapw.abacus.tree.NumberReducer
-import org.nwapw.abacus.tree.TreeNode
+import org.nwapw.abacus.tree.standard.NumberReducer
+import org.nwapw.abacus.tree.nodes.TreeNode
 
 /**
  * Core class to handle all mathematics.

core/src/main/kotlin/org/nwapw/abacus/EvaluationResult.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/context/EvaluationContext.kt

@@ -3,7 +3,7 @@ package org.nwapw.abacus.context
 import org.nwapw.abacus.number.NumberInterface
 import org.nwapw.abacus.plugin.NumberImplementation
 import org.nwapw.abacus.tree.Reducer
-import org.nwapw.abacus.tree.TreeNode
+import org.nwapw.abacus.tree.nodes.TreeNode
 
 /**
  * A context for the reduction of a [org.nwapw.abacus.tree.TreeNode] into a number.

core/src/main/kotlin/org/nwapw/abacus/context/MutableEvaluationContext.kt

@@ -3,7 +3,7 @@ package org.nwapw.abacus.context
 import org.nwapw.abacus.number.NumberInterface
 import org.nwapw.abacus.plugin.NumberImplementation
 import org.nwapw.abacus.tree.Reducer
-import org.nwapw.abacus.tree.TreeNode
+import org.nwapw.abacus.tree.nodes.TreeNode
 
 /**
  * A reduction context that is mutable.

core/src/main/kotlin/org/nwapw/abacus/function/Applicable.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.function.applicable
+package org.nwapw.abacus.function
 
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.exception.DomainException

core/src/main/kotlin/org/nwapw/abacus/function/interfaces/NumberFunction.kt

@@ -1,6 +1,6 @@
-package org.nwapw.abacus.function
+package org.nwapw.abacus.function.interfaces
 
-import org.nwapw.abacus.function.applicable.Applicable
+import org.nwapw.abacus.function.Applicable
 import org.nwapw.abacus.number.NumberInterface
 
 /**

core/src/main/kotlin/org/nwapw/abacus/function/interfaces/NumberOperator.kt

@@ -1,6 +1,9 @@
-package org.nwapw.abacus.function
+package org.nwapw.abacus.function.interfaces
 
-import org.nwapw.abacus.function.applicable.Applicable
+import org.nwapw.abacus.function.Applicable
+import org.nwapw.abacus.function.Operator
+import org.nwapw.abacus.function.OperatorAssociativity
+import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface
 
 /**

core/src/main/kotlin/org/nwapw/abacus/function/interfaces/TreeValueFunction.kt

@@ -1,8 +1,8 @@
-package org.nwapw.abacus.function
+package org.nwapw.abacus.function.interfaces
 
-import org.nwapw.abacus.function.applicable.Applicable
+import org.nwapw.abacus.function.Applicable
 import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.TreeNode
+import org.nwapw.abacus.tree.nodes.TreeNode
 
 /**
  * A function that operates on trees.

core/src/main/kotlin/org/nwapw/abacus/function/interfaces/TreeValueOperator.kt

@@ -1,8 +1,11 @@
-package org.nwapw.abacus.function
+package org.nwapw.abacus.function.interfaces
 
-import org.nwapw.abacus.function.applicable.Applicable
+import org.nwapw.abacus.function.Applicable
+import org.nwapw.abacus.function.Operator
+import org.nwapw.abacus.function.OperatorAssociativity
+import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.TreeNode
+import org.nwapw.abacus.tree.nodes.TreeNode
 
 /**
  * An operator that operates on trees.

core/src/main/kotlin/org/nwapw/abacus/number/NumberInterface.kt

@@ -1,6 +1,7 @@
 package org.nwapw.abacus.number
 
 import org.nwapw.abacus.exception.ComputationInterruptedException
+import org.nwapw.abacus.number.range.NumberRangeBuilder
 
 abstract class NumberInterface: Comparable<NumberInterface> {
 

core/src/main/kotlin/org/nwapw/abacus/number/promotion/NumberUtils.kt

@@ -1,5 +1,7 @@
 @file:JvmName("NumberUtils")
-package org.nwapw.abacus.number
+package org.nwapw.abacus.number.promotion
+
+import org.nwapw.abacus.number.NumberInterface
 
 typealias PromotionFunction = java.util.function.Function<NumberInterface, NumberInterface>
 typealias PromotionPath = List<PromotionFunction>

core/src/main/kotlin/org/nwapw/abacus/number/promotion/PromotionManager.kt

@@ -1,7 +1,8 @@
-package org.nwapw.abacus.number
+package org.nwapw.abacus.number.promotion
 
 import org.nwapw.abacus.Abacus
 import org.nwapw.abacus.exception.PromotionException
+import org.nwapw.abacus.number.NumberInterface
 import org.nwapw.abacus.plugin.NumberImplementation
 import org.nwapw.abacus.plugin.PluginListener
 import org.nwapw.abacus.plugin.PluginManager
@@ -51,7 +52,7 @@ class PromotionManager(val abacus: Abacus) : PluginListener {
         val implementations = numbers.map { pluginManager.interfaceImplementationFor(it.javaClass) }
         val highestPriority = implementations.sortedBy { it.priority }.last()
         return PromotionResult(items = numbers.map {
-            if(it.javaClass == highestPriority.implementation) it
+            if (it.javaClass == highestPriority.implementation) it
             else computePaths[pluginManager.interfaceImplementationFor(it.javaClass) to highestPriority]
                     ?.promote(it) ?: throw PromotionException()
         }.toTypedArray(), promotedTo = highestPriority)

core/src/main/kotlin/org/nwapw/abacus/number/promotion/PromotionResult.kt

@@ -1,5 +1,6 @@
-package org.nwapw.abacus.number
+package org.nwapw.abacus.number.promotion
 
+import org.nwapw.abacus.number.NumberInterface
 import org.nwapw.abacus.plugin.NumberImplementation
 
 /**

core/src/main/kotlin/org/nwapw/abacus/number/range/NumberRange.kt

@@ -1,6 +1,7 @@
-package org.nwapw.abacus.number
+package org.nwapw.abacus.number.range
 
 import org.nwapw.abacus.Abacus
+import org.nwapw.abacus.number.NumberInterface
 
 /**
  * A closed range designed specifically for [NumberInterface]

core/src/main/kotlin/org/nwapw/abacus/number/range/NumberRangeBuilder.kt

@@ -1,6 +1,7 @@
-package org.nwapw.abacus.number
+package org.nwapw.abacus.number.range
 
 import org.nwapw.abacus.Abacus
+import org.nwapw.abacus.number.NumberInterface
 
 /**
  * A utility class for creating [NumberRange] instances.

core/src/main/kotlin/org/nwapw/abacus/parsing/Parser.kt

@@ -1,6 +1,6 @@
 package org.nwapw.abacus.parsing
 
-import org.nwapw.abacus.tree.TreeNode
+import org.nwapw.abacus.tree.nodes.TreeNode
 
 /**
  * Converter from tokens into a parse tree.

core/src/main/kotlin/org/nwapw/abacus/parsing/TreeBuilder.kt

@@ -1,6 +1,6 @@
 package org.nwapw.abacus.parsing
 
-import org.nwapw.abacus.tree.TreeNode
+import org.nwapw.abacus.tree.nodes.TreeNode
 
 /**
  * Class to combine a [Tokenizer] and a [Parser]

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorAdd.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorCaret.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDefine.kt

@@ -3,10 +3,10 @@ package org.nwapw.abacus.plugin.standard.operator
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.TreeValueOperator
+import org.nwapw.abacus.function.interfaces.TreeValueOperator
 import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.TreeNode
-import org.nwapw.abacus.tree.VariableNode
+import org.nwapw.abacus.tree.nodes.TreeNode
+import org.nwapw.abacus.tree.nodes.VariableNode
 
 /**
  * The definition operator.

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorDivide.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorFactorial.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorMultiply.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNcr.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNegate.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorNpr.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSet.kt

@@ -3,10 +3,10 @@ package org.nwapw.abacus.plugin.standard.operator
 import org.nwapw.abacus.context.MutableEvaluationContext
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
-import org.nwapw.abacus.function.TreeValueOperator
+import org.nwapw.abacus.function.interfaces.TreeValueOperator
 import org.nwapw.abacus.number.NumberInterface
-import org.nwapw.abacus.tree.TreeNode
-import org.nwapw.abacus.tree.VariableNode
+import org.nwapw.abacus.tree.nodes.TreeNode
+import org.nwapw.abacus.tree.nodes.VariableNode
 
 /**
  * The set operator.

core/src/main/kotlin/org/nwapw/abacus/plugin/standard/operator/OperatorSubtract.kt

@@ -1,7 +1,7 @@
 package org.nwapw.abacus.plugin.standard.operator
 
 import org.nwapw.abacus.context.MutableEvaluationContext
-import org.nwapw.abacus.function.NumberOperator
+import org.nwapw.abacus.function.interfaces.NumberOperator
 import org.nwapw.abacus.function.OperatorAssociativity
 import org.nwapw.abacus.function.OperatorType
 import org.nwapw.abacus.number.NumberInterface

core/src/main/kotlin/org/nwapw/abacus/tree/Reducer.kt

@@ -1,5 +1,7 @@
 package org.nwapw.abacus.tree
 
+import org.nwapw.abacus.tree.nodes.TreeNode
+
 /**
  * Reducer interface that takes a tree and returns a single value.
  *

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/BinaryNode.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
 
 /**
  * A tree node that holds a binary operation.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/CallNode.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
 
 /**
  * Represents a more generic function call.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/NumberBinaryNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A binary operator node that reduces its children.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/NumberFunctionNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that holds a function call.
@@ -8,7 +10,7 @@ package org.nwapw.abacus.tree
  *
  * @param function the function string.
  */
-class FunctionNode(function: String, children: List<TreeNode>) : CallNode(function, children) {
+class NumberFunctionNode(function: String, children: List<TreeNode>) : CallNode(function, children) {
 
     override fun <T : Any> reduce(reducer: Reducer<T>): T {
         val children = Array<Any>(children.size, { children[it].reduce(reducer) })

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/NumberNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that holds a single number value.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/NumberUnaryNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A unary operator node that reduces its children.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/TreeNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/TreeValueBinaryNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that represents a binary tree value operator.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/TreeValueFunctionNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that represents a tree value function call.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/TreeValueUnaryNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that represents a unary tree value operator.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/UnaryNode.kt

@@ -1,4 +1,4 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
 
 /**
  * A tree node that holds a unary operation.

core/src/main/kotlin/org/nwapw/abacus/tree/nodes/VariableNode.kt

@@ -1,4 +1,6 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.nodes
+
+import org.nwapw.abacus.tree.Reducer
 
 /**
  * A tree node that holds a placeholder variable.

core/src/main/kotlin/org/nwapw/abacus/tree/standard/NumberReducer.kt

@@ -1,10 +1,12 @@
-package org.nwapw.abacus.tree
+package org.nwapw.abacus.tree.standard
 
 import org.nwapw.abacus.Abacus
 import org.nwapw.abacus.context.EvaluationContext
 import org.nwapw.abacus.exception.NumberReducerException
 import org.nwapw.abacus.exception.ReductionException
 import org.nwapw.abacus.number.NumberInterface
+import org.nwapw.abacus.tree.Reducer
+import org.nwapw.abacus.tree.nodes.*
 
 class NumberReducer(val abacus: Abacus, context: EvaluationContext) : Reducer<NumberInterface> {
 
@@ -40,7 +42,7 @@ class NumberReducer(val abacus: Abacus, context: EvaluationContext) : Reducer<Nu
                 context.numberImplementation = promotionResult.promotedTo
                 abacus.pluginManager.operatorFor(treeNode.operation).apply(context, *promotionResult.items)
             }
-            is FunctionNode -> {
+            is NumberFunctionNode -> {
                 val promotionResult = promotionManager
                         .promote(*children.map { it as NumberInterface }.toTypedArray())
                 context.numberImplementation = promotionResult.promotedTo

core/src/test/java/org/nwapw/abacus/tests/CalculationTests.java

@@ -8,7 +8,7 @@ import org.nwapw.abacus.config.Configuration;
 import org.nwapw.abacus.exception.DomainException;
 import org.nwapw.abacus.number.NumberInterface;
 import org.nwapw.abacus.plugin.standard.StandardPlugin;
-import org.nwapw.abacus.tree.TreeNode;
+import org.nwapw.abacus.tree.nodes.TreeNode;
 
 public class CalculationTests {
 

core/src/test/java/org/nwapw/abacus/tests/LexerTests.java

@@ -3,7 +3,7 @@ package org.nwapw.abacus.tests;
 import org.junit.Assert;
 import org.junit.Test;
 import org.nwapw.abacus.lexing.Lexer;
-import org.nwapw.abacus.lexing.pattern.Match;
+import org.nwapw.abacus.lexing.Match;
 
 import java.util.List;
 

core/src/test/java/org/nwapw/abacus/tests/RangeTests.java

@@ -5,10 +5,10 @@ import org.junit.BeforeClass;
 import org.junit.Test;
 import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.config.Configuration;
-import org.nwapw.abacus.number.NaiveNumber;
+import org.nwapw.abacus.number.standard.NaiveNumber;
 import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.number.NumberRange;
-import org.nwapw.abacus.number.PreciseNumber;
+import org.nwapw.abacus.number.range.NumberRange;
+import org.nwapw.abacus.number.standard.PreciseNumber;
 import org.nwapw.abacus.plugin.standard.StandardPlugin;
 
 import java.util.function.Function;

core/src/test/java/org/nwapw/abacus/tests/TokenizerTests.java

@@ -7,11 +7,13 @@ import org.nwapw.abacus.Abacus;
 import org.nwapw.abacus.config.Configuration;
 import org.nwapw.abacus.context.MutableEvaluationContext;
 import org.nwapw.abacus.function.*;
-import org.nwapw.abacus.lexing.pattern.Match;
+import org.nwapw.abacus.function.interfaces.NumberFunction;
+import org.nwapw.abacus.function.interfaces.NumberOperator;
+import org.nwapw.abacus.lexing.Match;
 import org.nwapw.abacus.number.NumberInterface;
-import org.nwapw.abacus.parsing.LexerTokenizer;
+import org.nwapw.abacus.parsing.standard.LexerTokenizer;
 import org.nwapw.abacus.plugin.Plugin;
-import org.nwapw.abacus.tree.TokenType;
+import org.nwapw.abacus.parsing.standard.TokenType;
 
 import java.util.List;
 

fx/src/main/java/org/nwapw/abacus/fx/AbacusController.java

@@ -20,8 +20,8 @@ import org.nwapw.abacus.plugin.ClassFinder;
 import org.nwapw.abacus.plugin.PluginListener;
 import org.nwapw.abacus.plugin.PluginManager;
 import org.nwapw.abacus.plugin.standard.StandardPlugin;
-import org.nwapw.abacus.tree.EvaluationResult;
-import org.nwapw.abacus.tree.TreeNode;
+import org.nwapw.abacus.EvaluationResult;
+import org.nwapw.abacus.tree.nodes.TreeNode;
 
 import java.io.File;
 import java.io.IOException;