refactor: Rename function packages to be plural when possible

src/main/java/marco/lang/functions/def.java → src/main/java/marco/lang/functions/bindings/def.java

@@ -1,4 +1,4 @@
-package marco.lang.functions;
+package marco.lang.functions.bindings;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/let.java → src/main/java/marco/lang/functions/bindings/let.java

@@ -1,4 +1,4 @@
-package marco.lang.functions;
+package marco.lang.functions.bindings;
 
 import marco.lang.MarcoBlock;
 import marco.lang.MarcoNativeBlock;

src/main/java/marco/lang/functions/setbang.java → src/main/java/marco/lang/functions/bindings/setbang.java

@@ -1,4 +1,4 @@
-package marco.lang.functions;
+package marco.lang.functions.bindings;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/var.java → src/main/java/marco/lang/functions/bindings/var.java

@@ -1,4 +1,4 @@
-package marco.lang.functions;
+package marco.lang.functions.bindings;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/block/invoke.java → src/main/java/marco/lang/functions/blocks/invoke.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.block;
+package marco.lang.functions.blocks;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/block/module.java → src/main/java/marco/lang/functions/blocks/module.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.block;
+package marco.lang.functions.blocks;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/booleans/_if.java → src/main/java/marco/lang/functions/control_flow/_if.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.booleans;
+package marco.lang.functions.control_flow;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/_while.java → src/main/java/marco/lang/functions/control_flow/_while.java

@@ -1,4 +1,4 @@
-package marco.lang.functions;
+package marco.lang.functions.control_flow;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/system/exit.java → src/main/java/marco/lang/functions/control_flow/exit.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.system;
+package marco.lang.functions.control_flow;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/doc/doc.java → src/main/java/marco/lang/functions/docstrings/doc.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.doc;
+package marco.lang.functions.docstrings;
 
 import marco.lang.MarcoNativeBlock;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/function/function.java → src/main/java/marco/lang/functions/functions/function.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.function;
+package marco.lang.functions.functions;
 
 import marco.lang.MarcoBlock;
 import marco.lang.MarcoFunction;

src/main/java/marco/lang/functions/function/function_question.java → src/main/java/marco/lang/functions/functions/function_question.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.function;
+package marco.lang.functions.functions;
 
 import marco.runtime.Environment;
 import marco.lang.MarcoBoolean;

src/main/java/marco/lang/functions/hash_map/hash_map.java → src/main/java/marco/lang/functions/hash_maps/hash_map.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.hash_map;
+package marco.lang.functions.hash_maps;
 
 import marco.lang.MarcoNativeBlock;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/integer/parse.java → src/main/java/marco/lang/functions/integers/parse.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.integer;
+package marco.lang.functions.integers;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/module/export.java → src/main/java/marco/lang/functions/modules/export.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.module;
+package marco.lang.functions.modules;
 
 import marco.lang.MarcoNativeBlock;
 import marco.lang.MarcoNil;

src/main/java/marco/lang/functions/module/include.java → src/main/java/marco/lang/functions/modules/include.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.module;
+package marco.lang.functions.modules;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/module/require.java → src/main/java/marco/lang/functions/modules/require.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.module;
+package marco.lang.functions.modules;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/module/require_native.java → src/main/java/marco/lang/functions/modules/require_native.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.module;
+package marco.lang.functions.modules;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/number/BinaryOperator.java → src/main/java/marco/lang/functions/numbers/BinaryOperator.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.runtime.Environment;
 import marco.lang.MarcoFunction;

src/main/java/marco/lang/functions/number/BinaryOperatorBody.java → src/main/java/marco/lang/functions/numbers/BinaryOperatorBody.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.runtime.Cast;
 import marco.runtime.Environment;

src/main/java/marco/lang/functions/number/division.java → src/main/java/marco/lang/functions/numbers/division.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoNumber;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/number/equal.java → src/main/java/marco/lang/functions/numbers/equal.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoBoolean;
 import marco.lang.MarcoNumber;

src/main/java/marco/lang/functions/number/greaterthan.java → src/main/java/marco/lang/functions/numbers/greaterthan.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoBoolean;
 import marco.lang.MarcoNumber;

src/main/java/marco/lang/functions/number/greaterthanorequal.java → src/main/java/marco/lang/functions/numbers/greaterthanorequal.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoBoolean;
 import marco.lang.MarcoNumber;

src/main/java/marco/lang/functions/number/lessthan.java → src/main/java/marco/lang/functions/numbers/lessthan.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoBoolean;
 import marco.lang.MarcoNumber;

src/main/java/marco/lang/functions/number/lessthanorequal.java → src/main/java/marco/lang/functions/numbers/lessthanorequal.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoBoolean;
 import marco.lang.MarcoNumber;

src/main/java/marco/lang/functions/number/minus.java → src/main/java/marco/lang/functions/numbers/minus.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoNumber;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/number/multiplication.java → src/main/java/marco/lang/functions/numbers/multiplication.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoNumber;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/number/plus.java → src/main/java/marco/lang/functions/numbers/plus.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoNumber;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/number/remainder.java → src/main/java/marco/lang/functions/numbers/remainder.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.number;
+package marco.lang.functions.numbers;
 
 import marco.lang.MarcoNumber;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/pair/first.java → src/main/java/marco/lang/functions/pairs/first.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.pair;
+package marco.lang.functions.pairs;
 
 import marco.lang.MarcoNativeBlock;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/pair/pair.java → src/main/java/marco/lang/functions/pairs/pair.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.pair;
+package marco.lang.functions.pairs;
 
 import marco.lang.MarcoNativeBlock;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/pair/pair_question.java → src/main/java/marco/lang/functions/pairs/pair_question.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.pair;
+package marco.lang.functions.pairs;
 
 import marco.lang.MarcoBoolean;
 import marco.lang.MarcoNativeBlock;

src/main/java/marco/lang/functions/pair/second.java → src/main/java/marco/lang/functions/pairs/second.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.pair;
+package marco.lang.functions.pairs;
 
 import marco.lang.MarcoNativeBlock;
 import marco.lang.MarcoObject;

src/main/java/marco/lang/functions/string/concat.java → src/main/java/marco/lang/functions/strings/concat.java

@@ -1,4 +1,4 @@
-package marco.lang.functions.string;
+package marco.lang.functions.strings;
 
 import marco.lang.MarcoNativeBlock;
 import marco.lang.MarcoObject;

src/main/java/marco/runtime/TopLevelEnvironment.java

@@ -4,29 +4,33 @@
 import marco.lang.MarcoFunction;
 import marco.lang.MarcoNil;
 import marco.lang.functions.*;
-import marco.lang.functions.block.invoke;
-import marco.lang.functions.block.module;
-import marco.lang.functions.booleans._if;
+import marco.lang.functions.bindings.def;
+import marco.lang.functions.bindings.let;
+import marco.lang.functions.bindings.setbang;
+import marco.lang.functions.bindings.var;
+import marco.lang.functions.blocks.invoke;
+import marco.lang.functions.blocks.module;
+import marco.lang.functions.control_flow._if;
 import marco.lang.functions.booleans._not;
-import marco.lang.functions.doc.doc;
-import marco.lang.functions.function.function;
-import marco.lang.functions.function.function_question;
-import marco.lang.functions.hash_map.hash_map;
+import marco.lang.functions.control_flow._while;
+import marco.lang.functions.docstrings.doc;
+import marco.lang.functions.functions.function;
+import marco.lang.functions.functions.function_question;
+import marco.lang.functions.hash_maps.hash_map;
 import marco.lang.functions.io.print;
 import marco.lang.functions.metadata.meta;
 import marco.lang.functions.metadata.with_meta;
-import marco.lang.functions.module.export;
-import marco.lang.functions.module.include;
-import marco.lang.functions.module.require;
-import marco.lang.functions.module.require_native;
+import marco.lang.functions.modules.export;
+import marco.lang.functions.modules.include;
+import marco.lang.functions.modules.require;
+import marco.lang.functions.modules.require_native;
 import marco.lang.functions.nil.nil_question;
-import marco.lang.functions.number.*;
-import marco.lang.functions.pair.first;
-import marco.lang.functions.pair.pair;
-import marco.lang.functions.pair.pair_question;
-import marco.lang.functions.pair.second;
-import marco.lang.functions.string.concat;
-import marco.lang.functions.system.exit;
+import marco.lang.functions.numbers.*;
+import marco.lang.functions.pairs.first;
+import marco.lang.functions.pairs.pair;
+import marco.lang.functions.pairs.pair_question;
+import marco.lang.functions.pairs.second;
+import marco.lang.functions.control_flow.exit;
 
 import java.util.Arrays;
 

src/main/java/marco/runtime/modules/NativeIntegerModule.java

@@ -3,7 +3,7 @@
 import marco.runtime.Environment;
 import marco.lang.MarcoFunction;
 import marco.lang.MarcoModule;
-import marco.lang.functions.integer.parse;
+import marco.lang.functions.integers.parse;
 
 import java.util.Arrays;
 

src/main/java/marco/runtime/modules/NativeStringModule.java

@@ -2,7 +2,7 @@
 
 import marco.lang.MarcoFunction;
 import marco.lang.MarcoModule;
-import marco.lang.functions.string.concat;
+import marco.lang.functions.strings.concat;
 import marco.runtime.Environment;
 
 import java.util.Arrays;