Package refactoring to avoid verbose paths (#4)

44 files changed, 123 insertions, 137 deletions

diff --git a/.gitignore b/.gitignore
index 7b69749..29ba4ac 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
 out/
 trees/
 .project
+.vscode/
\ No newline at end of file
diff --git a/Makefile b/Makefile
index d04c40e..0a15718 100644
--- a/Makefile
+++ b/Makefile
@@ -4,8 +4,8 @@ JAVAC_FLAGS = -cp $(ANTLR_COMPLETE) -Xlint:deprecation -d out
 SRC_DIR = src
 PARSER_DIR = src/parser
 BIN_DIR = out
-MAIN_CLASS = com.clp.project.Main
-PARSEALL_CLASS = com.clp.project.ParseAll
+MAIN_CLASS = Main
+PARSEALL_CLASS = ParseAll
 SOURCES = $(wildcard $(SRC_DIR)/*.java $(SRC_DIR)/*/*.java $(SRC_DIR)/*/*/*.java)
 GRAMMARS = $(PARSER_DIR)/Python3Lexer.g4 $(PARSER_DIR)/Python3Parser.g4
 ANTLR_OUTPUT = $(PARSER_DIR)/*.java
diff --git a/src/Main.java b/src/Main.java
index c672e19..3987bad 100644
--- a/src/Main.java
+++ b/src/Main.java
@@ -1,21 +1,16 @@
-package com.clp.project;
-
 import java.io.BufferedReader;
-import java.io.File;
 import java.io.FileReader;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Objects;
 import javax.swing.*;
 import org.antlr.v4.gui.TreeViewer;
 import org.antlr.v4.runtime.*;
-import org.antlr.v4.runtime.tree.*;
 
-import com.clp.project.ast.*;
-import com.clp.project.ast.nodes.*;
-import com.clp.project.parser.*;
-import com.clp.project.semanticanalysis.*;
+import ast.*;
+import ast.nodes.*;
+import parser.*;
+import semanticanalysis.*;
 
 public class Main {
 
diff --git a/src/ParseAll.java b/src/ParseAll.java
index 37de220..3e5d868 100644
--- a/src/ParseAll.java
+++ b/src/ParseAll.java
@@ -1,5 +1,3 @@
-package com.clp.project;
-
 import java.io.BufferedReader;
 import java.io.File;
 import java.io.FileReader;
@@ -10,9 +8,10 @@ import javax.swing.*;
 import org.antlr.v4.gui.TreeViewer;
 import org.antlr.v4.runtime.*;
 
-import com.clp.project.parser.*;
+import parser.*;
 
 public class ParseAll {
+    @SuppressWarnings("unused")
     public static void main(String[] args) {
         new File("./trees/").mkdirs();
         for (File file : Objects.requireNonNull(new File("./progs").listFiles())) {
@@ -52,6 +51,7 @@ public class ParseAll {
         }
     }
 
+    @SuppressWarnings("unused")
     private static String readFile(String filePath) throws IOException {
         StringBuilder content = new StringBuilder();
         try (BufferedReader reader = new BufferedReader(new FileReader(filePath))) {
@@ -63,6 +63,7 @@ public class ParseAll {
         return content.toString();
     }
 
+    @SuppressWarnings("unused")
     private static void showTree(TreeViewer viewer) {
         JFrame frame = new JFrame("Parse Tree");
         JPanel panel = new JPanel();
diff --git a/src/ast/Python3VisitorImpl.java b/src/ast/Python3VisitorImpl.java
index 0783409..604c8d2 100644
--- a/src/ast/Python3VisitorImpl.java
+++ b/src/ast/Python3VisitorImpl.java
@@ -1,13 +1,10 @@
-package com.clp.project.ast;
+package ast;
 
 import java.util.ArrayList;
-import java.util.List;
 
-import com.clp.project.ast.*;
-import com.clp.project.ast.nodes.*;
-import com.clp.project.ast.types.*;
-import com.clp.project.parser.Python3ParserBaseVisitor;
-import com.clp.project.parser.Python3Parser.*;
+import ast.nodes.*;
+import parser.Python3ParserBaseVisitor;
+import parser.Python3Parser.*;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
diff --git a/src/ast/nodes/ArglistNode.java b/src/ast/nodes/ArglistNode.java
index 8a5b4b9..f0c33e1 100644
--- a/src/ast/nodes/ArglistNode.java
+++ b/src/ast/nodes/ArglistNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `arglist` statement of the grammar.
diff --git a/src/ast/nodes/AssignmentNode.java b/src/ast/nodes/AssignmentNode.java
index d722f41..627e842 100644
--- a/src/ast/nodes/AssignmentNode.java
+++ b/src/ast/nodes/AssignmentNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `assignment` statement of the grammar.
diff --git a/src/ast/nodes/AtomNode.java b/src/ast/nodes/AtomNode.java
index fa81f92..4dcb926 100644
--- a/src/ast/nodes/AtomNode.java
+++ b/src/ast/nodes/AtomNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `atom` statement of the grammar.
diff --git a/src/ast/nodes/AugassignNode.java b/src/ast/nodes/AugassignNode.java
index 3519b50..629fbcd 100644
--- a/src/ast/nodes/AugassignNode.java
+++ b/src/ast/nodes/AugassignNode.java
@@ -1,11 +1,11 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
 
-import com.clp.project.ast.types.*;
+import ast.types.*;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
diff --git a/src/ast/nodes/BlockNode.java b/src/ast/nodes/BlockNode.java
index 1fdfcc3..6b07f49 100644
--- a/src/ast/nodes/BlockNode.java
+++ b/src/ast/nodes/BlockNode.java
@@ -1,16 +1,14 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import ast.types.*;
 
 /**
  * Node for `block` statement of the grammar.
  * It extends the `RootNode`.
  */
-public class BlockNode extends RootNode implements Node {
+public class BlockNode extends RootNode {
     public BlockNode(ArrayList<Node> stmts, ArrayList<Node> compoundStmts) {
         super(stmts, compoundStmts);
     }
diff --git a/src/ast/nodes/CompNode.java b/src/ast/nodes/CompNode.java
index 6deb51c..33976bf 100644
--- a/src/ast/nodes/CompNode.java
+++ b/src/ast/nodes/CompNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
diff --git a/src/ast/nodes/CompoundNode.java b/src/ast/nodes/CompoundNode.java
index bfa0523..e64be9e 100644
--- a/src/ast/nodes/CompoundNode.java
+++ b/src/ast/nodes/CompoundNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `compound_node` statement of the grammar.
diff --git a/src/ast/nodes/DottedNameNode.java b/src/ast/nodes/DottedNameNode.java
index 342950a..46d1b61 100644
--- a/src/ast/nodes/DottedNameNode.java
+++ b/src/ast/nodes/DottedNameNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
diff --git a/src/ast/nodes/ExprNode.java b/src/ast/nodes/ExprNode.java
index 3aa112f..25c2016 100644
--- a/src/ast/nodes/ExprNode.java
+++ b/src/ast/nodes/ExprNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `expr` statement of the grammar.
diff --git a/src/ast/nodes/ForStmtNode.java b/src/ast/nodes/ForStmtNode.java
index 69dee74..6d94bb2 100644
--- a/src/ast/nodes/ForStmtNode.java
+++ b/src/ast/nodes/ForStmtNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `for_stmt` statement of the grammar.
diff --git a/src/ast/nodes/FuncdefNode.java b/src/ast/nodes/FuncdefNode.java
index c48eb1c..67bc772 100644
--- a/src/ast/nodes/FuncdefNode.java
+++ b/src/ast/nodes/FuncdefNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
diff --git a/src/ast/nodes/IfNode.java b/src/ast/nodes/IfNode.java
index a4f160d..50dde4a 100644
--- a/src/ast/nodes/IfNode.java
+++ b/src/ast/nodes/IfNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `if` statement of the grammar.
diff --git a/src/ast/nodes/ImportNode.java b/src/ast/nodes/ImportNode.java
index e6ac8c7..e264c99 100644
--- a/src/ast/nodes/ImportNode.java
+++ b/src/ast/nodes/ImportNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `import_stmt` statement of the grammar.
diff --git a/src/ast/nodes/Node.java b/src/ast/nodes/Node.java
index f807745..949531e 100644
--- a/src/ast/nodes/Node.java
+++ b/src/ast/nodes/Node.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Base interface for a Node.
diff --git a/src/ast/nodes/ParamdefNode.java b/src/ast/nodes/ParamdefNode.java
index d8e04f7..481282e 100644
--- a/src/ast/nodes/ParamdefNode.java
+++ b/src/ast/nodes/ParamdefNode.java
@@ -1,17 +1,12 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
-import java.util.ArrayList;
-
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-
-import com.clp.project.ast.types.*;
+import ast.types.*;
 
 /**
  * Node for the `paramdef` statement of the grammar. Extends the `AtomNode`
  * class.
  */
-public class ParamdefNode extends AtomNode implements Node {
+public class ParamdefNode extends AtomNode {
     public ParamdefNode(String val) {
         super(val);
     }
diff --git a/src/ast/nodes/ParamlistNode.java b/src/ast/nodes/ParamlistNode.java
index d4f40b8..144eb13 100644
--- a/src/ast/nodes/ParamlistNode.java
+++ b/src/ast/nodes/ParamlistNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `param_list` statement of the grammar.
diff --git a/src/ast/nodes/ReturnStmtNode.java b/src/ast/nodes/ReturnStmtNode.java
index 0cfd2b4..0f2dd74 100644
--- a/src/ast/nodes/ReturnStmtNode.java
+++ b/src/ast/nodes/ReturnStmtNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `return_stmt` statement of the grammar.
diff --git a/src/ast/nodes/RootNode.java b/src/ast/nodes/RootNode.java
index 12d2f22..e0989e8 100644
--- a/src/ast/nodes/RootNode.java
+++ b/src/ast/nodes/RootNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `root` statement of the grammar.
diff --git a/src/ast/nodes/SimpleStmtNode.java b/src/ast/nodes/SimpleStmtNode.java
index 3f4dec3..5f844cb 100644
--- a/src/ast/nodes/SimpleStmtNode.java
+++ b/src/ast/nodes/SimpleStmtNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `simple_stmt` statement of the grammar.
diff --git a/src/ast/nodes/SimpleStmtsNode.java b/src/ast/nodes/SimpleStmtsNode.java
index c8013a3..66c8e2c 100644
--- a/src/ast/nodes/SimpleStmtsNode.java
+++ b/src/ast/nodes/SimpleStmtsNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `simple_stmts` statement of the grammar.
diff --git a/src/ast/nodes/TrailerNode.java b/src/ast/nodes/TrailerNode.java
index fa7e1ed..b0a0ee7 100644
--- a/src/ast/nodes/TrailerNode.java
+++ b/src/ast/nodes/TrailerNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 import org.antlr.v4.runtime.tree.TerminalNode;
 
 /**
diff --git a/src/ast/nodes/WhileStmtNode.java b/src/ast/nodes/WhileStmtNode.java
index a84d60e..6353ec1 100644
--- a/src/ast/nodes/WhileStmtNode.java
+++ b/src/ast/nodes/WhileStmtNode.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.nodes;
+package ast.nodes;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.types.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.types.*;
 
 /**
  * Node for the `while_stmt` statement of the grammar.
diff --git a/src/ast/types/AtomType.java b/src/ast/types/AtomType.java
index a44a06c..0387ec1 100644
--- a/src/ast/types/AtomType.java
+++ b/src/ast/types/AtomType.java
@@ -1,4 +1,4 @@
-package com.clp.project.ast.types;
+package ast.types;
 
 /**
  * An tom type.
diff --git a/src/ast/types/BoolType.java b/src/ast/types/BoolType.java
index 7fc28ee..20c2750 100644
--- a/src/ast/types/BoolType.java
+++ b/src/ast/types/BoolType.java
@@ -1,4 +1,4 @@
-package com.clp.project.ast.types;
+package ast.types;
 
 /**
  * A boolean type. A bool is True or False.
diff --git a/src/ast/types/ErrorType.java b/src/ast/types/ErrorType.java
index 30cb70e..4a7a0cf 100644
--- a/src/ast/types/ErrorType.java
+++ b/src/ast/types/ErrorType.java
@@ -1,4 +1,4 @@
-package com.clp.project.ast.types;
+package ast.types;
 
 /**
  * Error type.
diff --git a/src/ast/types/IntType.java b/src/ast/types/IntType.java
index 9f4b250..a29518b 100644
--- a/src/ast/types/IntType.java
+++ b/src/ast/types/IntType.java
@@ -1,4 +1,4 @@
-package com.clp.project.ast.types;
+package ast.types;
 
 /**
  * An integer type.
diff --git a/src/ast/types/Type.java b/src/ast/types/Type.java
index 4756255..6bff8b9 100644
--- a/src/ast/types/Type.java
+++ b/src/ast/types/Type.java
@@ -1,10 +1,10 @@
-package com.clp.project.ast.types;
+package ast.types;
 
 import java.util.ArrayList;
 
-import com.clp.project.semanticanalysis.SemanticError;
-import com.clp.project.semanticanalysis.SymbolTable;
-import com.clp.project.ast.nodes.*;
+import semanticanalysis.SemanticError;
+import semanticanalysis.SymbolTable;
+import ast.nodes.*;
 
 /**
  * A node which represents a type class.
diff --git a/src/ast/types/VoidType.java b/src/ast/types/VoidType.java
index 766aee2..d15933f 100644
--- a/src/ast/types/VoidType.java
+++ b/src/ast/types/VoidType.java
@@ -1,4 +1,4 @@
-package com.clp.project.ast.types;
+package ast.types;
 
 /**
  * A void type. Voids return nothing.
diff --git a/src/parser/Python3Lexer.java b/src/parser/Python3Lexer.java
index ae33e3d..96ee595 100644
--- a/src/parser/Python3Lexer.java
+++ b/src/parser/Python3Lexer.java
@@ -1,4 +1,4 @@
-package com.clp.project.parser;
+package parser;
 
 // Generated from src/parser/Python3Lexer.g4 by ANTLR 4.13.1
 import org.antlr.v4.runtime.Lexer;
diff --git a/src/parser/Python3LexerBase.java b/src/parser/Python3LexerBase.java
index e2246a3..2090e0e 100644
--- a/src/parser/Python3LexerBase.java
+++ b/src/parser/Python3LexerBase.java
@@ -1,4 +1,4 @@
-package com.clp.project.parser;
+package parser;
 
 import java.util.ArrayDeque;
 import java.util.Deque;
diff --git a/src/parser/Python3Parser.java b/src/parser/Python3Parser.java
index a407482..5e59ca1 100644
--- a/src/parser/Python3Parser.java
+++ b/src/parser/Python3Parser.java
@@ -1,4 +1,4 @@
-package com.clp.project.parser;
+package parser;
 
 // Generated from src/parser/Python3Parser.g4 by ANTLR 4.13.1
 import org.antlr.v4.runtime.atn.*;
diff --git a/src/parser/Python3ParserBase.java b/src/parser/Python3ParserBase.java
index 8e437c4..2ae06eb 100644
--- a/src/parser/Python3ParserBase.java
+++ b/src/parser/Python3ParserBase.java
@@ -1,4 +1,4 @@
-package com.clp.project.parser;
+package parser;
 
 import org.antlr.v4.runtime.*;
 
diff --git a/src/parser/Python3ParserBaseListener.java b/src/parser/Python3ParserBaseListener.java
index 7191565..99a9155 100644
--- a/src/parser/Python3ParserBaseListener.java
+++ b/src/parser/Python3ParserBaseListener.java
@@ -1,4 +1,4 @@
-package com.clp.project.parser;
+package parser;
 // Generated from src/parser/Python3Parser.g4 by ANTLR 4.13.1
 
 import org.antlr.v4.runtime.ParserRuleContext;
diff --git a/src/parser/Python3ParserBaseVisitor.java b/src/parser/Python3ParserBaseVisitor.java
index 4fc355f..06e8e67 100644
--- a/src/parser/Python3ParserBaseVisitor.java
+++ b/src/parser/Python3ParserBaseVisitor.java
@@ -1,4 +1,4 @@
-package com.clp.project.parser;
+package parser;
 
 // Generated from src/parser/Python3Parser.g4 by ANTLR 4.13.1
 import org.antlr.v4.runtime.tree.AbstractParseTreeVisitor;
diff --git a/src/parser/Python3ParserListener.java b/src/parser/Python3ParserListener.java
index f71a32d..e937957 100644
--- a/src/parser/Python3ParserListener.java
+++ b/src/parser/Python3ParserListener.java
@@ -1,4 +1,4 @@
-package com.clp.project.parser;
+package parser;
 
 // Generated from src/parser/Python3Parser.g4 by ANTLR 4.13.1
 import org.antlr.v4.runtime.tree.ParseTreeListener;
diff --git a/src/parser/Python3ParserVisitor.java b/src/parser/Python3ParserVisitor.java
index 88607ed..09d5527 100644
--- a/src/parser/Python3ParserVisitor.java
+++ b/src/parser/Python3ParserVisitor.java
@@ -1,4 +1,4 @@
-package com.clp.project.parser;
+package parser;
 
 // Generated from src/parser/Python3Parser.g4 by ANTLR 4.13.1
 import org.antlr.v4.runtime.tree.ParseTreeVisitor;
diff --git a/src/semanticanalysis/STentry.java b/src/semanticanalysis/STentry.java
index 42990fa..0e4b00e 100644
--- a/src/semanticanalysis/STentry.java
+++ b/src/semanticanalysis/STentry.java
@@ -1,6 +1,6 @@
-package com.clp.project.semanticanalysis;
+package semanticanalysis;
 
-import com.clp.project.ast.types.Type;
+import ast.types.Type;
 
 /**
  * Entry class for the symbol table.
diff --git a/src/semanticanalysis/SemanticError.java b/src/semanticanalysis/SemanticError.java
index 1df1ce9..745e3fb 100644
--- a/src/semanticanalysis/SemanticError.java
+++ b/src/semanticanalysis/SemanticError.java
@@ -1,4 +1,4 @@
-package com.clp.project.semanticanalysis;
+package semanticanalysis;
 
 /**
  * Class respresents a semantic error.
diff --git a/src/semanticanalysis/SymbolTable.java b/src/semanticanalysis/SymbolTable.java
index d4fda37..f2876db 100644
--- a/src/semanticanalysis/SymbolTable.java
+++ b/src/semanticanalysis/SymbolTable.java
@@ -1,9 +1,8 @@
-package com.clp.project.semanticanalysis;
+package semanticanalysis;
 
 import java.util.ArrayList;
 import java.util.HashMap;
-import com.clp.project.ast.*;
-import com.clp.project.ast.types.*;
+import ast.types.*;
 
 /**
  * Class representing a symbol table. It's a list of hash table symbol table. We