diff --git a/src/com/annimon/ownlang/parser/Linter.java b/src/com/annimon/ownlang/parser/Linter.java
index 52555e0..999236a 100644
--- a/src/com/annimon/ownlang/parser/Linter.java
+++ b/src/com/annimon/ownlang/parser/Linter.java
@@ -1,10 +1,13 @@
 package com.annimon.ownlang.parser;
 
+import com.annimon.ownlang.Console;
+import com.annimon.ownlang.parser.linters.AssignValidator;
+import com.annimon.ownlang.parser.linters.UseWithNonStringValueValidator;
+import com.annimon.ownlang.parser.linters.DefaultFunctionsOverrideValidator;
 import com.annimon.ownlang.lib.Functions;
 import com.annimon.ownlang.lib.Variables;
 import com.annimon.ownlang.parser.ast.Statement;
 import com.annimon.ownlang.parser.ast.Visitor;
-import com.annimon.ownlang.parser.visitors.*;
 
 public final class Linter {
 
@@ -29,7 +32,7 @@ public final class Linter {
             program.accept(validator);
             resetState();
         }
-        System.out.println("Lint validation complete!");
+        Console.println("Lint validation complete!");
     }
 
     private void resetState() {
diff --git a/src/com/annimon/ownlang/parser/visitors/AssignValidator.java b/src/com/annimon/ownlang/parser/linters/AssignValidator.java
similarity index 95%
rename from src/com/annimon/ownlang/parser/visitors/AssignValidator.java
rename to src/com/annimon/ownlang/parser/linters/AssignValidator.java
index 52bd6c4..0b65f2b 100644
--- a/src/com/annimon/ownlang/parser/visitors/AssignValidator.java
+++ b/src/com/annimon/ownlang/parser/linters/AssignValidator.java
@@ -1,4 +1,4 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.linters;
 
 import com.annimon.ownlang.Console;
 import com.annimon.ownlang.lib.Variables;
diff --git a/src/com/annimon/ownlang/parser/visitors/DefaultFunctionsOverrideValidator.java b/src/com/annimon/ownlang/parser/linters/DefaultFunctionsOverrideValidator.java
similarity index 94%
rename from src/com/annimon/ownlang/parser/visitors/DefaultFunctionsOverrideValidator.java
rename to src/com/annimon/ownlang/parser/linters/DefaultFunctionsOverrideValidator.java
index b44946e..e5bff52 100644
--- a/src/com/annimon/ownlang/parser/visitors/DefaultFunctionsOverrideValidator.java
+++ b/src/com/annimon/ownlang/parser/linters/DefaultFunctionsOverrideValidator.java
@@ -1,4 +1,4 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.linters;
 
 import com.annimon.ownlang.Console;
 import com.annimon.ownlang.lib.Functions;
diff --git a/src/com/annimon/ownlang/parser/visitors/LintVisitor.java b/src/com/annimon/ownlang/parser/linters/LintVisitor.java
similarity index 73%
rename from src/com/annimon/ownlang/parser/visitors/LintVisitor.java
rename to src/com/annimon/ownlang/parser/linters/LintVisitor.java
index 622e9a4..c6fa5a9 100644
--- a/src/com/annimon/ownlang/parser/visitors/LintVisitor.java
+++ b/src/com/annimon/ownlang/parser/linters/LintVisitor.java
@@ -1,8 +1,10 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.linters;
 
 import com.annimon.ownlang.parser.ast.IncludeStatement;
 import com.annimon.ownlang.parser.ast.Statement;
 import com.annimon.ownlang.parser.ast.Visitor;
+import com.annimon.ownlang.parser.visitors.AbstractVisitor;
+import com.annimon.ownlang.parser.visitors.VisitorUtils;
 
 public abstract class LintVisitor extends AbstractVisitor {
 
diff --git a/src/com/annimon/ownlang/parser/visitors/UseWithNonStringValueValidator.java b/src/com/annimon/ownlang/parser/linters/UseWithNonStringValueValidator.java
similarity index 95%
rename from src/com/annimon/ownlang/parser/visitors/UseWithNonStringValueValidator.java
rename to src/com/annimon/ownlang/parser/linters/UseWithNonStringValueValidator.java
index 655d05b..fa4745c 100644
--- a/src/com/annimon/ownlang/parser/visitors/UseWithNonStringValueValidator.java
+++ b/src/com/annimon/ownlang/parser/linters/UseWithNonStringValueValidator.java
@@ -1,4 +1,4 @@
-package com.annimon.ownlang.parser.visitors;
+package com.annimon.ownlang.parser.linters;
 
 import com.annimon.ownlang.Console;
 import com.annimon.ownlang.lib.Types;