diff --git a/bastokenizer/.gitignore b/.gitignore
similarity index 100%
rename from bastokenizer/.gitignore
rename to .gitignore
diff --git a/bastokenizer/IDEAS.txt b/IDEAS.txt
similarity index 100%
rename from bastokenizer/IDEAS.txt
rename to IDEAS.txt
diff --git a/bastokenizer/pom.xml b/pom.xml
similarity index 100%
rename from bastokenizer/pom.xml
rename to pom.xml
diff --git a/bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/ApplesoftKeyword.java b/src/main/java/com/webcodepro/applecommander/util/applesoft/ApplesoftKeyword.java
similarity index 100%
rename from bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/ApplesoftKeyword.java
rename to src/main/java/com/webcodepro/applecommander/util/applesoft/ApplesoftKeyword.java
diff --git a/bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Line.java b/src/main/java/com/webcodepro/applecommander/util/applesoft/Line.java
similarity index 100%
rename from bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Line.java
rename to src/main/java/com/webcodepro/applecommander/util/applesoft/Line.java
diff --git a/bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Parser.java b/src/main/java/com/webcodepro/applecommander/util/applesoft/Parser.java
similarity index 100%
rename from bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Parser.java
rename to src/main/java/com/webcodepro/applecommander/util/applesoft/Parser.java
diff --git a/bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Program.java b/src/main/java/com/webcodepro/applecommander/util/applesoft/Program.java
similarity index 100%
rename from bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Program.java
rename to src/main/java/com/webcodepro/applecommander/util/applesoft/Program.java
diff --git a/bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Statement.java b/src/main/java/com/webcodepro/applecommander/util/applesoft/Statement.java
similarity index 100%
rename from bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Statement.java
rename to src/main/java/com/webcodepro/applecommander/util/applesoft/Statement.java
diff --git a/bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Token.java b/src/main/java/com/webcodepro/applecommander/util/applesoft/Token.java
similarity index 100%
rename from bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/Token.java
rename to src/main/java/com/webcodepro/applecommander/util/applesoft/Token.java
diff --git a/bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/TokenReader.java b/src/main/java/com/webcodepro/applecommander/util/applesoft/TokenReader.java
similarity index 100%
rename from bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/TokenReader.java
rename to src/main/java/com/webcodepro/applecommander/util/applesoft/TokenReader.java
diff --git a/bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/package-info.java b/src/main/java/com/webcodepro/applecommander/util/applesoft/package-info.java
similarity index 100%
rename from bastokenizer/src/main/java/com/webcodepro/applecommander/util/applesoft/package-info.java
rename to src/main/java/com/webcodepro/applecommander/util/applesoft/package-info.java
diff --git a/bastokenizer/src/main/java/io/github/applecommander/bastokenizer/Main.java b/src/main/java/io/github/applecommander/bastokenizer/Main.java
similarity index 100%
rename from bastokenizer/src/main/java/io/github/applecommander/bastokenizer/Main.java
rename to src/main/java/io/github/applecommander/bastokenizer/Main.java
diff --git a/bastokenizer/src/test/resources/gravestone.bas b/src/test/resources/gravestone.bas
similarity index 100%
rename from bastokenizer/src/test/resources/gravestone.bas
rename to src/test/resources/gravestone.bas
diff --git a/bastokenizer/src/test/resources/jewel-draw1.bas b/src/test/resources/jewel-draw1.bas
similarity index 100%
rename from bastokenizer/src/test/resources/jewel-draw1.bas
rename to src/test/resources/jewel-draw1.bas
diff --git a/bastokenizer/src/test/resources/jewel-draw2.bas b/src/test/resources/jewel-draw2.bas
similarity index 100%
rename from bastokenizer/src/test/resources/jewel-draw2.bas
rename to src/test/resources/jewel-draw2.bas
diff --git a/bastokenizer/src/test/resources/test.bas b/src/test/resources/test.bas
similarity index 100%
rename from bastokenizer/src/test/resources/test.bas
rename to src/test/resources/test.bas