diff --git a/jode/jode/expr/LocalVarOperator.java b/jode/jode/expr/LocalVarOperator.java
index a693743..988f390 100644
--- a/jode/jode/expr/LocalVarOperator.java
+++ b/jode/jode/expr/LocalVarOperator.java
@@ -18,7 +18,7 @@
  */
 
 package jode.expr;
-import jode.Type;
+import jode.type.Type;
 import jode.decompiler.LocalInfo;
 
 public interface LocalVarOperator {
diff --git a/jode/jode/expr/NoArgOperator.java b/jode/jode/expr/NoArgOperator.java
index 7ec56b4..8dd2a51 100644
--- a/jode/jode/expr/NoArgOperator.java
+++ b/jode/jode/expr/NoArgOperator.java
@@ -18,8 +18,9 @@
  */
 
 package jode.expr;
-import jode.Type;
+import jode.type.Type;
 import jode.AssertError;
+import jode.decompiler.TabbedPrintWriter;
 
 public abstract class NoArgOperator extends Operator {
 
@@ -47,4 +48,3 @@ public abstract class NoArgOperator extends Operator {
         throw new AssertError("This operator has no operands");
     }
 }
-
diff --git a/jode/jode/expr/ShiftOperator.java b/jode/jode/expr/ShiftOperator.java
index 412f563..b2527c6 100644
--- a/jode/jode/expr/ShiftOperator.java
+++ b/jode/jode/expr/ShiftOperator.java
@@ -18,7 +18,7 @@
  */
 
 package jode.expr;
-import jode.Type;
+import jode.type.Type;
 
 /**
  * ShiftOpcodes are special, because their second operand is an UIndex
diff --git a/jode/jode/expr/SimpleOperator.java b/jode/jode/expr/SimpleOperator.java
index 14a40b9..5f0949e 100644
--- a/jode/jode/expr/SimpleOperator.java
+++ b/jode/jode/expr/SimpleOperator.java
@@ -18,7 +18,7 @@
  */
 
 package jode.expr;
-import jode.Type;
+import jode.type.Type;
 
 public abstract class SimpleOperator extends Operator {
     protected Type[] operandTypes;
diff --git a/jode/jode/flow/CatchBlock.java b/jode/jode/flow/CatchBlock.java
index 9af303c..32a7d24 100644
--- a/jode/jode/flow/CatchBlock.java
+++ b/jode/jode/flow/CatchBlock.java
@@ -18,7 +18,7 @@
  */
 
 package jode.flow;
-import jode.Type;
+import jode.type.Type;
 import jode.decompiler.LocalInfo;
 
 /**
diff --git a/jode/jode/flow/CombineIfGotoExpressions.java b/jode/jode/flow/CombineIfGotoExpressions.java
index 09ac7d1..5366b24 100644
--- a/jode/jode/flow/CombineIfGotoExpressions.java
+++ b/jode/jode/flow/CombineIfGotoExpressions.java
@@ -20,7 +20,7 @@
 package jode.flow;
 import java.util.Vector;
 import jode.expr.*;
-import jode.Type;
+import jode.type.Type;
 
 public class CombineIfGotoExpressions {
 
diff --git a/jode/jode/flow/CreateCheckNull.java b/jode/jode/flow/CreateCheckNull.java
index 5542c83..4822d65 100644
--- a/jode/jode/flow/CreateCheckNull.java
+++ b/jode/jode/flow/CreateCheckNull.java
@@ -19,7 +19,7 @@
 
 package jode.flow;
 import jode.expr.*;
-import jode.Type;
+import jode.type.Type;
 import jode.decompiler.LocalInfo;
 
 public class CreateCheckNull {
diff --git a/jode/jode/flow/CreateClassField.java b/jode/jode/flow/CreateClassField.java
index af83a61..73b8218 100644
--- a/jode/jode/flow/CreateClassField.java
+++ b/jode/jode/flow/CreateClassField.java
@@ -19,7 +19,7 @@
 
 package jode.flow;
 import jode.expr.*;
-import jode.Type;
+import jode.type.Type;
 import jode.decompiler.LocalInfo;
 
 public class CreateClassField {
diff --git a/jode/jode/flow/CreateConstantArray.java b/jode/jode/flow/CreateConstantArray.java
index d9e824b..a9b4e55 100644
--- a/jode/jode/flow/CreateConstantArray.java
+++ b/jode/jode/flow/CreateConstantArray.java
@@ -20,7 +20,7 @@
 package jode.flow;
 import jode.Decompiler;
 import jode.expr.*;
-import jode.Type;
+import jode.type.Type;
 
 public class CreateConstantArray {
 
diff --git a/jode/jode/flow/CreateIfThenElseOperator.java b/jode/jode/flow/CreateIfThenElseOperator.java
index f517c3d..567b15d 100644
--- a/jode/jode/flow/CreateIfThenElseOperator.java
+++ b/jode/jode/flow/CreateIfThenElseOperator.java
@@ -19,7 +19,7 @@
 
 package jode.flow;
 import jode.Decompiler;
-import jode.Type;
+import jode.type.Type;
 import jode.expr.*;
 
 import java.util.Enumeration;
diff --git a/jode/jode/flow/IfThenElseBlock.java b/jode/jode/flow/IfThenElseBlock.java
index d9edf2e..1e8f275 100644
--- a/jode/jode/flow/IfThenElseBlock.java
+++ b/jode/jode/flow/IfThenElseBlock.java
@@ -21,7 +21,7 @@ package jode.flow;
 import jode.decompiler.LocalInfo;
 import jode.decompiler.TabbedPrintWriter;
 import jode.expr.Expression;
-import jode.Type;
+import jode.type.Type;
 
 /**
  * An IfThenElseBlock is the structured block representing an if
diff --git a/jode/jode/flow/InstructionBlock.java b/jode/jode/flow/InstructionBlock.java
index ba598dd..d528680 100644
--- a/jode/jode/flow/InstructionBlock.java
+++ b/jode/jode/flow/InstructionBlock.java
@@ -18,7 +18,7 @@
  */
 
 package jode.flow;
-import jode.Type;
+import jode.type.Type;
 import jode.decompiler.TabbedPrintWriter;
 import jode.decompiler.LocalInfo;
 import jode.expr.ComplexExpression;
@@ -127,7 +127,7 @@ public class InstructionBlock extends InstructionContainer {
 			   + local.getName() + " = "
                            + expr.simplify().toString() + ";");
         } else {
-            if (instr.getType() != jode.Type.tVoid)
+            if (instr.getType() != Type.tVoid)
                 writer.print("PUSH ");
             writer.println(instr.simplify().toString()+";");
         }
diff --git a/jode/jode/flow/JsrBlock.java b/jode/jode/flow/JsrBlock.java
index 382fcc1..6bf2491 100644
--- a/jode/jode/flow/JsrBlock.java
+++ b/jode/jode/flow/JsrBlock.java
@@ -19,7 +19,7 @@
 
 package jode.flow;
 import jode.decompiler.LocalInfo;
-import jode.Type;
+import jode.type.Type;
 
 /** 
  * This block represents a jsr instruction.  A jsr instruction is
diff --git a/jode/jode/flow/LoopBlock.java b/jode/jode/flow/LoopBlock.java
index 0a52968..a112d37 100644
--- a/jode/jode/flow/LoopBlock.java
+++ b/jode/jode/flow/LoopBlock.java
@@ -19,7 +19,7 @@
 
 package jode.flow;
 import jode.decompiler.TabbedPrintWriter;
-import jode.Type;
+import jode.type.Type;
 import jode.decompiler.LocalInfo;
 import jode.expr.Expression;
 import jode.expr.ConstOperator;
diff --git a/jode/jode/flow/TransformExceptionHandlers.java b/jode/jode/flow/TransformExceptionHandlers.java
index 8d01175..c105384 100644
--- a/jode/jode/flow/TransformExceptionHandlers.java
+++ b/jode/jode/flow/TransformExceptionHandlers.java
@@ -20,7 +20,7 @@
 package jode.flow;
 import jode.AssertError;
 import jode.Decompiler;
-import jode.Type;
+import jode.type.Type;
 import jode.decompiler.LocalInfo;
 import jode.expr.*;
 
@@ -882,7 +882,7 @@ public class TransformExceptionHandlers {
                      && ! analyzeSpecialFinally(tryFlow, catchFlow, 
                                                 endHandler))
 
-                analyzeCatchBlock(jode.Type.tObject, tryFlow, catchFlow);
+                analyzeCatchBlock(Type.tObject, tryFlow, catchFlow);
 
             tryFlow.checkConsistent();
             if (Decompiler.debugAnalyze)
diff --git a/jode/jode/jvm/SimpleRuntimeEnvironment.java b/jode/jode/jvm/SimpleRuntimeEnvironment.java
index c4ad4a6..54fc854 100644
--- a/jode/jode/jvm/SimpleRuntimeEnvironment.java
+++ b/jode/jode/jvm/SimpleRuntimeEnvironment.java
@@ -18,8 +18,9 @@
  */
 
 package jode.jvm;
+import jode.AssertError;
 import jode.bytecode.Reference;
-import jode.*;
+import jode.type.*;
 import java.lang.reflect.*;
 
 public class SimpleRuntimeEnvironment implements RuntimeEnvironment {
diff --git a/jode/jode/obfuscator/ConstantRuntimeEnvironment.java b/jode/jode/obfuscator/ConstantRuntimeEnvironment.java
index d9d7a4f..f74fa9b 100644
--- a/jode/jode/obfuscator/ConstantRuntimeEnvironment.java
+++ b/jode/jode/obfuscator/ConstantRuntimeEnvironment.java
@@ -21,7 +21,7 @@ package jode.obfuscator;
 import jode.jvm.*;
 import jode.bytecode.Reference;
 import jode.bytecode.BytecodeInfo;
-import jode.*;
+import jode.type.*;
 import java.lang.reflect.Array;
 import java.lang.reflect.InvocationTargetException;
 import java.util.*;
diff --git a/jode/jode/obfuscator/MethodIdentifier.java b/jode/jode/obfuscator/MethodIdentifier.java
index 936c97d..96fb20d 100644
--- a/jode/jode/obfuscator/MethodIdentifier.java
+++ b/jode/jode/obfuscator/MethodIdentifier.java
@@ -21,7 +21,7 @@ package jode.obfuscator;
 import java.lang.reflect.Modifier;
 import jode.Obfuscator;
 import jode.bytecode.*;
-import jode.Type;
+import jode.type.Type;
 import java.io.*;
 import java.util.Vector;
 import java.util.Enumeration;
diff --git a/jode/jode/obfuscator/RemovePopAnalyzer.java b/jode/jode/obfuscator/RemovePopAnalyzer.java
index 6f6b789..821d736 100644
--- a/jode/jode/obfuscator/RemovePopAnalyzer.java
+++ b/jode/jode/obfuscator/RemovePopAnalyzer.java
@@ -20,8 +20,8 @@
 package jode.obfuscator;
 import jode.bytecode.*;
 import jode.AssertError;
-import jode.MethodType;
-import jode.Type;
+import jode.type.MethodType;
+import jode.type.Type;
 
 public class RemovePopAnalyzer implements CodeAnalyzer, Opcodes {
     MethodIdentifier m;
diff --git a/jode/jode/obfuscator/SimpleAnalyzer.java b/jode/jode/obfuscator/SimpleAnalyzer.java
index 3002ccc..3ecd687 100644
--- a/jode/jode/obfuscator/SimpleAnalyzer.java
+++ b/jode/jode/obfuscator/SimpleAnalyzer.java
@@ -19,7 +19,7 @@
 
 package jode.obfuscator;
 import jode.bytecode.*;
-import jode.Type;
+import jode.type.Type;
 
 public class SimpleAnalyzer implements CodeAnalyzer, Opcodes {
     MethodIdentifier m;
diff --git a/jode/jode/type/IntegerType.java b/jode/jode/type/IntegerType.java
index ecc4367..0f82748 100644
--- a/jode/jode/type/IntegerType.java
+++ b/jode/jode/type/IntegerType.java
@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.type;
+import jode.Decompiler;
 
 /**
  * This is a type class for 16 bit integral types.  There are seven
diff --git a/jode/jode/type/MethodType.java b/jode/jode/type/MethodType.java
index 956ebba..5aa491e 100644
--- a/jode/jode/type/MethodType.java
+++ b/jode/jode/type/MethodType.java
@@ -17,7 +17,7 @@
  * $Id$
  */
 
-package jode;
+package jode.type;
 
 /** 
  * This type represents an method type.
diff --git a/jode/jode/type/NullType.java b/jode/jode/type/NullType.java
index e49cef0..40bd256 100644
--- a/jode/jode/type/NullType.java
+++ b/jode/jode/type/NullType.java
@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.type;
+import jode.AssertError;
 
 /**
  * This class represents the NullType.  The null type is special as it
@@ -64,7 +65,7 @@ public class NullType extends ReferenceType {
     }
 
     public String toString() {
-	return "/*NULL*/" + env.classString("java.lang.Object");
+	return "<NULL>";
     }
 
     /**
diff --git a/jode/jode/type/ReferenceType.java b/jode/jode/type/ReferenceType.java
index 56325da..70c94e5 100644
--- a/jode/jode/type/ReferenceType.java
+++ b/jode/jode/type/ReferenceType.java
@@ -17,7 +17,8 @@
  * $Id$
  */
 
-package jode;
+package jode.type;
+import jode.Decompiler;
 import jode.bytecode.ClassInfo;
 import java.util.Vector;
 import java.util.Stack;