diff --git a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/ErrorHandler.java b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/ErrorHandler.java
index 7f0d2011b..55bedcc2a 100644
--- a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/ErrorHandler.java
+++ b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/ErrorHandler.java
@@ -1,10 +1,10 @@
 package com.dfsek.terra.addons.terrascript.v2;
 
-import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
-
 import java.util.ArrayList;
 import java.util.List;
 
+import com.dfsek.terra.addons.terrascript.v2.exception.CompilationException;
+
 
 public class ErrorHandler {
     
diff --git a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/Type.java b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/Type.java
index 3623b0377..e772b522c 100644
--- a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/Type.java
+++ b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/Type.java
@@ -1,15 +1,14 @@
 package com.dfsek.terra.addons.terrascript.v2;
 
-import com.dfsek.terra.addons.terrascript.v2.codegen.CodegenType;
-import com.dfsek.terra.addons.terrascript.v2.codegen.NativeFunction;
-
-import com.dfsek.terra.api.util.generic.pair.Pair;
-
 import com.google.common.collect.Streams;
 
 import javax.annotation.Nullable;
 import java.util.List;
 
+import com.dfsek.terra.addons.terrascript.v2.codegen.CodegenType;
+import com.dfsek.terra.addons.terrascript.v2.codegen.NativeFunction;
+import com.dfsek.terra.api.util.generic.pair.Pair;
+
 
 public interface Type {
     
diff --git a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/DynamicClassLoader.java b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/DynamicClassLoader.java
index 765a4a13d..7206d0d58 100644
--- a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/DynamicClassLoader.java
+++ b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/DynamicClassLoader.java
@@ -1,8 +1,5 @@
 package com.dfsek.terra.addons.terrascript.v2.codegen.asm;
 
-import com.dfsek.terra.api.structure.Structure;
-
-
 public class DynamicClassLoader extends ClassLoader {
     public DynamicClassLoader(Class<?> clazz) {
         super(clazz.getClassLoader());
diff --git a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/TerraScriptClassGenerator.java b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/TerraScriptClassGenerator.java
index d6966f82f..a55ff8c38 100644
--- a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/TerraScriptClassGenerator.java
+++ b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/codegen/asm/TerraScriptClassGenerator.java
@@ -1,5 +1,23 @@
 package com.dfsek.terra.addons.terrascript.v2.codegen.asm;
 
+import org.objectweb.asm.ClassReader;
+import org.objectweb.asm.ClassVisitor;
+import org.objectweb.asm.ClassWriter;
+import org.objectweb.asm.Label;
+import org.objectweb.asm.MethodVisitor;
+import org.objectweb.asm.Opcodes;
+import org.objectweb.asm.commons.LocalVariablesSorter;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.util.ArrayDeque;
+import java.util.Deque;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
 import com.dfsek.terra.addons.terrascript.v2.Type;
 import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr;
 import com.dfsek.terra.addons.terrascript.v2.ast.TypedExpr.Assignment;
@@ -22,7 +40,6 @@ import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.NoOp;
 import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.Return;
 import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.VariableDeclaration;
 import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt.While;
-
 import com.dfsek.terra.addons.terrascript.v2.codegen.CodegenType;
 import com.dfsek.terra.addons.terrascript.v2.codegen.CodegenType.InstructionType;
 import com.dfsek.terra.addons.terrascript.v2.codegen.NativeFunction;
@@ -31,24 +48,6 @@ import com.dfsek.terra.addons.terrascript.v2.exception.CompilerBugException;
 import com.dfsek.terra.addons.terrascript.v2.util.ASMUtil;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 
-import org.objectweb.asm.ClassReader;
-import org.objectweb.asm.ClassVisitor;
-import org.objectweb.asm.ClassWriter;
-import org.objectweb.asm.Label;
-import org.objectweb.asm.MethodVisitor;
-import org.objectweb.asm.Opcodes;
-import org.objectweb.asm.commons.LocalVariablesSorter;
-
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOException;
-import java.util.ArrayDeque;
-import java.util.Deque;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
 import static com.dfsek.terra.addons.terrascript.v2.util.ASMUtil.dynamicName;
 
 public class TerraScriptClassGenerator {
diff --git a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/Lexer.java b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/Lexer.java
index 850060302..55d0af61f 100644
--- a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/Lexer.java
+++ b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/lexer/Lexer.java
@@ -7,12 +7,6 @@
 
 package com.dfsek.terra.addons.terrascript.v2.lexer;
 
-import com.dfsek.terra.addons.terrascript.v2.parser.ParseException;
-
-import com.dfsek.terra.addons.terrascript.v2.exception.lexer.EOFException;
-import com.dfsek.terra.addons.terrascript.v2.exception.lexer.FormatException;
-import com.dfsek.terra.addons.terrascript.v2.exception.lexer.TokenizerException;
-
 import com.google.common.collect.Sets;
 
 import java.util.ArrayList;
@@ -20,7 +14,11 @@ import java.util.Arrays;
 import java.util.List;
 import java.util.Set;
 
+import com.dfsek.terra.addons.terrascript.v2.exception.lexer.EOFException;
+import com.dfsek.terra.addons.terrascript.v2.exception.lexer.FormatException;
+import com.dfsek.terra.addons.terrascript.v2.exception.lexer.TokenizerException;
 import com.dfsek.terra.addons.terrascript.v2.lexer.Token.TokenType;
+import com.dfsek.terra.addons.terrascript.v2.parser.ParseException;
 
 
 public class Lexer {
diff --git a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/ScopeAnalyzer.java b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/ScopeAnalyzer.java
index a8f4385ea..504c1a108 100644
--- a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/ScopeAnalyzer.java
+++ b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/ScopeAnalyzer.java
@@ -1,5 +1,7 @@
 package com.dfsek.terra.addons.terrascript.v2.semanticanalysis;
 
+import java.util.List;
+
 import com.dfsek.terra.addons.terrascript.v2.Environment;
 import com.dfsek.terra.addons.terrascript.v2.Environment.Symbol;
 import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
@@ -19,9 +21,7 @@ import com.dfsek.terra.addons.terrascript.v2.ast.Stmt;
 import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.IdentifierAlreadyDeclaredException;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 
-import java.util.List;
-
-import static com.dfsek.terra.addons.terrascript.v2.Environment.ScopeException.*;
+import static com.dfsek.terra.addons.terrascript.v2.Environment.ScopeException.SymbolAlreadyExistsException;
 
 
 public class ScopeAnalyzer implements Visitor<Void>, Stmt.Visitor<Void> {
diff --git a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/TypeChecker.java b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/TypeChecker.java
index 17a894618..498f7356b 100644
--- a/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/TypeChecker.java
+++ b/common/addons/structure-terrascript-v2/src/main/java/com/dfsek/terra/addons/terrascript/v2/semanticanalysis/TypeChecker.java
@@ -21,7 +21,6 @@ import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidA
 import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidCalleeException;
 import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidFunctionDeclarationException;
 import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidTypeException;
-import com.dfsek.terra.addons.terrascript.v2.parser.ParseException;
 import com.dfsek.terra.api.util.generic.pair.Pair;
 
 import static com.dfsek.terra.addons.terrascript.v2.util.OrdinalUtil.ordinalOf;
diff --git a/common/addons/structure-terrascript-v2/src/test/java/codegen/CodeGenTest.java b/common/addons/structure-terrascript-v2/src/test/java/codegen/CodeGenTest.java
index 46929d745..047b53cb1 100644
--- a/common/addons/structure-terrascript-v2/src/test/java/codegen/CodeGenTest.java
+++ b/common/addons/structure-terrascript-v2/src/test/java/codegen/CodeGenTest.java
@@ -1,5 +1,7 @@
 package codegen;
 
+import org.junit.jupiter.api.Test;
+
 import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
 import com.dfsek.terra.addons.terrascript.v2.ast.Stmt.Block;
 import com.dfsek.terra.addons.terrascript.v2.ast.TypedStmt;
@@ -9,8 +11,6 @@ import com.dfsek.terra.addons.terrascript.v2.lexer.Lexer;
 import com.dfsek.terra.addons.terrascript.v2.parser.Parser;
 import com.dfsek.terra.addons.terrascript.v2.semanticanalysis.SemanticAnalyzer;
 
-import org.junit.jupiter.api.Test;
-
 
 public class CodeGenTest {
     
diff --git a/common/addons/structure-terrascript-v2/src/test/java/lexer/LexerTest.java b/common/addons/structure-terrascript-v2/src/test/java/lexer/LexerTest.java
index 6afbea2ae..07963f108 100644
--- a/common/addons/structure-terrascript-v2/src/test/java/lexer/LexerTest.java
+++ b/common/addons/structure-terrascript-v2/src/test/java/lexer/LexerTest.java
@@ -1,14 +1,11 @@
 package lexer;
 
-import com.dfsek.terra.addons.terrascript.v2.lexer.Lexer;
-
-import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
-import com.dfsek.terra.addons.terrascript.v2.lexer.Token;
-
-import com.dfsek.terra.addons.terrascript.v2.lexer.Token.TokenType;
-
 import org.junit.jupiter.api.Test;
 
+import com.dfsek.terra.addons.terrascript.v2.lexer.Lexer;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Token.TokenType;
 
 import static org.junit.jupiter.api.Assertions.*;
 
diff --git a/common/addons/structure-terrascript-v2/src/test/java/lexer/LookaheadStreamTest.java b/common/addons/structure-terrascript-v2/src/test/java/lexer/LookaheadStreamTest.java
index bfd2d8b7f..ca6d40a83 100644
--- a/common/addons/structure-terrascript-v2/src/test/java/lexer/LookaheadStreamTest.java
+++ b/common/addons/structure-terrascript-v2/src/test/java/lexer/LookaheadStreamTest.java
@@ -7,13 +7,12 @@
 
 package lexer;
 
-import com.dfsek.terra.addons.terrascript.v2.lexer.LookaheadStream;
-import com.dfsek.terra.addons.terrascript.v2.lexer.Char;
-
-import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
-
 import org.junit.jupiter.api.Test;
 
+import com.dfsek.terra.addons.terrascript.v2.lexer.Char;
+import com.dfsek.terra.addons.terrascript.v2.lexer.LookaheadStream;
+import com.dfsek.terra.addons.terrascript.v2.lexer.SourcePosition;
+
 import static org.junit.jupiter.api.Assertions.*;
 
 
diff --git a/common/addons/structure-terrascript-v2/src/test/java/semanticanalysis/SemanticAnalyzerTest.java b/common/addons/structure-terrascript-v2/src/test/java/semanticanalysis/SemanticAnalyzerTest.java
index c18285853..36fd94eca 100644
--- a/common/addons/structure-terrascript-v2/src/test/java/semanticanalysis/SemanticAnalyzerTest.java
+++ b/common/addons/structure-terrascript-v2/src/test/java/semanticanalysis/SemanticAnalyzerTest.java
@@ -1,17 +1,16 @@
 package semanticanalysis;
 
+import org.junit.jupiter.api.Test;
+
 import com.dfsek.terra.addons.terrascript.v2.ErrorHandler;
 import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.IdentifierAlreadyDeclaredException;
 import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidCalleeException;
-import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.UndefinedReferenceException;
-import com.dfsek.terra.addons.terrascript.v2.semanticanalysis.SemanticAnalyzer;
-import com.dfsek.terra.addons.terrascript.v2.lexer.Lexer;
-import com.dfsek.terra.addons.terrascript.v2.parser.Parser;
-
 import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidFunctionDeclarationException;
 import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.InvalidTypeException;
-
-import org.junit.jupiter.api.Test;
+import com.dfsek.terra.addons.terrascript.v2.exception.semanticanalysis.UndefinedReferenceException;
+import com.dfsek.terra.addons.terrascript.v2.lexer.Lexer;
+import com.dfsek.terra.addons.terrascript.v2.parser.Parser;
+import com.dfsek.terra.addons.terrascript.v2.semanticanalysis.SemanticAnalyzer;
 
 import static org.junit.jupiter.api.Assertions.*;