diff --git a/src/de/fernflower/code/CodeConstants.java b/src/org/jetbrains/java/decompiler/code/CodeConstants.java
similarity index 100%
rename from src/de/fernflower/code/CodeConstants.java
rename to src/org/jetbrains/java/decompiler/code/CodeConstants.java
diff --git a/src/de/fernflower/code/ConstantsUtil.java b/src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
similarity index 100%
rename from src/de/fernflower/code/ConstantsUtil.java
rename to src/org/jetbrains/java/decompiler/code/ConstantsUtil.java
diff --git a/src/de/fernflower/code/ExceptionHandler.java b/src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
similarity index 100%
rename from src/de/fernflower/code/ExceptionHandler.java
rename to src/org/jetbrains/java/decompiler/code/ExceptionHandler.java
diff --git a/src/de/fernflower/code/ExceptionTable.java b/src/org/jetbrains/java/decompiler/code/ExceptionTable.java
similarity index 100%
rename from src/de/fernflower/code/ExceptionTable.java
rename to src/org/jetbrains/java/decompiler/code/ExceptionTable.java
diff --git a/src/de/fernflower/code/FullInstructionSequence.java b/src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java
similarity index 100%
rename from src/de/fernflower/code/FullInstructionSequence.java
rename to src/org/jetbrains/java/decompiler/code/FullInstructionSequence.java
diff --git a/src/de/fernflower/code/IfInstruction.java b/src/org/jetbrains/java/decompiler/code/IfInstruction.java
similarity index 100%
rename from src/de/fernflower/code/IfInstruction.java
rename to src/org/jetbrains/java/decompiler/code/IfInstruction.java
diff --git a/src/de/fernflower/code/Instruction.java b/src/org/jetbrains/java/decompiler/code/Instruction.java
similarity index 100%
rename from src/de/fernflower/code/Instruction.java
rename to src/org/jetbrains/java/decompiler/code/Instruction.java
diff --git a/src/de/fernflower/code/InstructionSequence.java b/src/org/jetbrains/java/decompiler/code/InstructionSequence.java
similarity index 100%
rename from src/de/fernflower/code/InstructionSequence.java
rename to src/org/jetbrains/java/decompiler/code/InstructionSequence.java
diff --git a/src/de/fernflower/code/JumpInstruction.java b/src/org/jetbrains/java/decompiler/code/JumpInstruction.java
similarity index 100%
rename from src/de/fernflower/code/JumpInstruction.java
rename to src/org/jetbrains/java/decompiler/code/JumpInstruction.java
diff --git a/src/de/fernflower/code/SimpleInstructionSequence.java b/src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
similarity index 100%
rename from src/de/fernflower/code/SimpleInstructionSequence.java
rename to src/org/jetbrains/java/decompiler/code/SimpleInstructionSequence.java
diff --git a/src/de/fernflower/code/SwitchInstruction.java b/src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
similarity index 100%
rename from src/de/fernflower/code/SwitchInstruction.java
rename to src/org/jetbrains/java/decompiler/code/SwitchInstruction.java
diff --git a/src/de/fernflower/code/cfg/BasicBlock.java b/src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
similarity index 100%
rename from src/de/fernflower/code/cfg/BasicBlock.java
rename to src/org/jetbrains/java/decompiler/code/cfg/BasicBlock.java
diff --git a/src/de/fernflower/code/cfg/ControlFlowGraph.java b/src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
similarity index 100%
rename from src/de/fernflower/code/cfg/ControlFlowGraph.java
rename to src/org/jetbrains/java/decompiler/code/cfg/ControlFlowGraph.java
diff --git a/src/de/fernflower/code/cfg/ExceptionRangeCFG.java b/src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
similarity index 100%
rename from src/de/fernflower/code/cfg/ExceptionRangeCFG.java
rename to src/org/jetbrains/java/decompiler/code/cfg/ExceptionRangeCFG.java
diff --git a/src/de/fernflower/code/instructions/AALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/AALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/AALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/AALOAD.java
diff --git a/src/de/fernflower/code/instructions/AASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/AASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/AASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/AASTORE.java
diff --git a/src/de/fernflower/code/instructions/ACONST_NULL.java b/src/org/jetbrains/java/decompiler/code/instructions/ACONST_NULL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ACONST_NULL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ACONST_NULL.java
diff --git a/src/de/fernflower/code/instructions/ALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/ALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ALOAD.java
diff --git a/src/de/fernflower/code/instructions/ANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/instructions/ANEWARRAY.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ANEWARRAY.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ANEWARRAY.java
diff --git a/src/de/fernflower/code/instructions/ARETURN.java b/src/org/jetbrains/java/decompiler/code/instructions/ARETURN.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ARETURN.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ARETURN.java
diff --git a/src/de/fernflower/code/instructions/ARRAYLENGTH.java b/src/org/jetbrains/java/decompiler/code/instructions/ARRAYLENGTH.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ARRAYLENGTH.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ARRAYLENGTH.java
diff --git a/src/de/fernflower/code/instructions/ASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/ASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ASTORE.java
diff --git a/src/de/fernflower/code/instructions/ATHROW.java b/src/org/jetbrains/java/decompiler/code/instructions/ATHROW.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ATHROW.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ATHROW.java
diff --git a/src/de/fernflower/code/instructions/BALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/BALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/BALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/BALOAD.java
diff --git a/src/de/fernflower/code/instructions/BASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/BASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/BASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/BASTORE.java
diff --git a/src/de/fernflower/code/instructions/BIPUSH.java b/src/org/jetbrains/java/decompiler/code/instructions/BIPUSH.java
similarity index 100%
rename from src/de/fernflower/code/instructions/BIPUSH.java
rename to src/org/jetbrains/java/decompiler/code/instructions/BIPUSH.java
diff --git a/src/de/fernflower/code/instructions/CALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/CALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/CALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/CALOAD.java
diff --git a/src/de/fernflower/code/instructions/CASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/CASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/CASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/CASTORE.java
diff --git a/src/de/fernflower/code/instructions/CHECKCAST.java b/src/org/jetbrains/java/decompiler/code/instructions/CHECKCAST.java
similarity index 100%
rename from src/de/fernflower/code/instructions/CHECKCAST.java
rename to src/org/jetbrains/java/decompiler/code/instructions/CHECKCAST.java
diff --git a/src/de/fernflower/code/instructions/D2F.java b/src/org/jetbrains/java/decompiler/code/instructions/D2F.java
similarity index 100%
rename from src/de/fernflower/code/instructions/D2F.java
rename to src/org/jetbrains/java/decompiler/code/instructions/D2F.java
diff --git a/src/de/fernflower/code/instructions/D2I.java b/src/org/jetbrains/java/decompiler/code/instructions/D2I.java
similarity index 100%
rename from src/de/fernflower/code/instructions/D2I.java
rename to src/org/jetbrains/java/decompiler/code/instructions/D2I.java
diff --git a/src/de/fernflower/code/instructions/D2L.java b/src/org/jetbrains/java/decompiler/code/instructions/D2L.java
similarity index 100%
rename from src/de/fernflower/code/instructions/D2L.java
rename to src/org/jetbrains/java/decompiler/code/instructions/D2L.java
diff --git a/src/de/fernflower/code/instructions/DADD.java b/src/org/jetbrains/java/decompiler/code/instructions/DADD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DADD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DADD.java
diff --git a/src/de/fernflower/code/instructions/DALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/DALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DALOAD.java
diff --git a/src/de/fernflower/code/instructions/DASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/DASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DASTORE.java
diff --git a/src/de/fernflower/code/instructions/DCMPG.java b/src/org/jetbrains/java/decompiler/code/instructions/DCMPG.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DCMPG.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DCMPG.java
diff --git a/src/de/fernflower/code/instructions/DCMPL.java b/src/org/jetbrains/java/decompiler/code/instructions/DCMPL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DCMPL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DCMPL.java
diff --git a/src/de/fernflower/code/instructions/DCONST_0.java b/src/org/jetbrains/java/decompiler/code/instructions/DCONST_0.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DCONST_0.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DCONST_0.java
diff --git a/src/de/fernflower/code/instructions/DCONST_1.java b/src/org/jetbrains/java/decompiler/code/instructions/DCONST_1.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DCONST_1.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DCONST_1.java
diff --git a/src/de/fernflower/code/instructions/DDIV.java b/src/org/jetbrains/java/decompiler/code/instructions/DDIV.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DDIV.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DDIV.java
diff --git a/src/de/fernflower/code/instructions/DLOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/DLOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DLOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DLOAD.java
diff --git a/src/de/fernflower/code/instructions/DMUL.java b/src/org/jetbrains/java/decompiler/code/instructions/DMUL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DMUL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DMUL.java
diff --git a/src/de/fernflower/code/instructions/DNEG.java b/src/org/jetbrains/java/decompiler/code/instructions/DNEG.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DNEG.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DNEG.java
diff --git a/src/de/fernflower/code/instructions/DREM.java b/src/org/jetbrains/java/decompiler/code/instructions/DREM.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DREM.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DREM.java
diff --git a/src/de/fernflower/code/instructions/DRETURN.java b/src/org/jetbrains/java/decompiler/code/instructions/DRETURN.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DRETURN.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DRETURN.java
diff --git a/src/de/fernflower/code/instructions/DSTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/DSTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DSTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DSTORE.java
diff --git a/src/de/fernflower/code/instructions/DSUB.java b/src/org/jetbrains/java/decompiler/code/instructions/DSUB.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DSUB.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DSUB.java
diff --git a/src/de/fernflower/code/instructions/DUP.java b/src/org/jetbrains/java/decompiler/code/instructions/DUP.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DUP.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DUP.java
diff --git a/src/de/fernflower/code/instructions/DUP2.java b/src/org/jetbrains/java/decompiler/code/instructions/DUP2.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DUP2.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DUP2.java
diff --git a/src/de/fernflower/code/instructions/DUP2_X1.java b/src/org/jetbrains/java/decompiler/code/instructions/DUP2_X1.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DUP2_X1.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DUP2_X1.java
diff --git a/src/de/fernflower/code/instructions/DUP2_X2.java b/src/org/jetbrains/java/decompiler/code/instructions/DUP2_X2.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DUP2_X2.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DUP2_X2.java
diff --git a/src/de/fernflower/code/instructions/DUP_X1.java b/src/org/jetbrains/java/decompiler/code/instructions/DUP_X1.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DUP_X1.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DUP_X1.java
diff --git a/src/de/fernflower/code/instructions/DUP_X2.java b/src/org/jetbrains/java/decompiler/code/instructions/DUP_X2.java
similarity index 100%
rename from src/de/fernflower/code/instructions/DUP_X2.java
rename to src/org/jetbrains/java/decompiler/code/instructions/DUP_X2.java
diff --git a/src/de/fernflower/code/instructions/F2D.java b/src/org/jetbrains/java/decompiler/code/instructions/F2D.java
similarity index 100%
rename from src/de/fernflower/code/instructions/F2D.java
rename to src/org/jetbrains/java/decompiler/code/instructions/F2D.java
diff --git a/src/de/fernflower/code/instructions/F2I.java b/src/org/jetbrains/java/decompiler/code/instructions/F2I.java
similarity index 100%
rename from src/de/fernflower/code/instructions/F2I.java
rename to src/org/jetbrains/java/decompiler/code/instructions/F2I.java
diff --git a/src/de/fernflower/code/instructions/F2L.java b/src/org/jetbrains/java/decompiler/code/instructions/F2L.java
similarity index 100%
rename from src/de/fernflower/code/instructions/F2L.java
rename to src/org/jetbrains/java/decompiler/code/instructions/F2L.java
diff --git a/src/de/fernflower/code/instructions/FADD.java b/src/org/jetbrains/java/decompiler/code/instructions/FADD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FADD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FADD.java
diff --git a/src/de/fernflower/code/instructions/FALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/FALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FALOAD.java
diff --git a/src/de/fernflower/code/instructions/FASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/FASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FASTORE.java
diff --git a/src/de/fernflower/code/instructions/FCMPG.java b/src/org/jetbrains/java/decompiler/code/instructions/FCMPG.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FCMPG.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FCMPG.java
diff --git a/src/de/fernflower/code/instructions/FCMPL.java b/src/org/jetbrains/java/decompiler/code/instructions/FCMPL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FCMPL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FCMPL.java
diff --git a/src/de/fernflower/code/instructions/FCONST_0.java b/src/org/jetbrains/java/decompiler/code/instructions/FCONST_0.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FCONST_0.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FCONST_0.java
diff --git a/src/de/fernflower/code/instructions/FCONST_1.java b/src/org/jetbrains/java/decompiler/code/instructions/FCONST_1.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FCONST_1.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FCONST_1.java
diff --git a/src/de/fernflower/code/instructions/FCONST_2.java b/src/org/jetbrains/java/decompiler/code/instructions/FCONST_2.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FCONST_2.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FCONST_2.java
diff --git a/src/de/fernflower/code/instructions/FDIV.java b/src/org/jetbrains/java/decompiler/code/instructions/FDIV.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FDIV.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FDIV.java
diff --git a/src/de/fernflower/code/instructions/FLOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/FLOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FLOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FLOAD.java
diff --git a/src/de/fernflower/code/instructions/FMUL.java b/src/org/jetbrains/java/decompiler/code/instructions/FMUL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FMUL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FMUL.java
diff --git a/src/de/fernflower/code/instructions/FNEG.java b/src/org/jetbrains/java/decompiler/code/instructions/FNEG.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FNEG.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FNEG.java
diff --git a/src/de/fernflower/code/instructions/FREM.java b/src/org/jetbrains/java/decompiler/code/instructions/FREM.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FREM.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FREM.java
diff --git a/src/de/fernflower/code/instructions/FRETURN.java b/src/org/jetbrains/java/decompiler/code/instructions/FRETURN.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FRETURN.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FRETURN.java
diff --git a/src/de/fernflower/code/instructions/FSTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/FSTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FSTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FSTORE.java
diff --git a/src/de/fernflower/code/instructions/FSUB.java b/src/org/jetbrains/java/decompiler/code/instructions/FSUB.java
similarity index 100%
rename from src/de/fernflower/code/instructions/FSUB.java
rename to src/org/jetbrains/java/decompiler/code/instructions/FSUB.java
diff --git a/src/de/fernflower/code/instructions/GETFIELD.java b/src/org/jetbrains/java/decompiler/code/instructions/GETFIELD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/GETFIELD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/GETFIELD.java
diff --git a/src/de/fernflower/code/instructions/GETSTATIC.java b/src/org/jetbrains/java/decompiler/code/instructions/GETSTATIC.java
similarity index 100%
rename from src/de/fernflower/code/instructions/GETSTATIC.java
rename to src/org/jetbrains/java/decompiler/code/instructions/GETSTATIC.java
diff --git a/src/de/fernflower/code/instructions/GOTO.java b/src/org/jetbrains/java/decompiler/code/instructions/GOTO.java
similarity index 100%
rename from src/de/fernflower/code/instructions/GOTO.java
rename to src/org/jetbrains/java/decompiler/code/instructions/GOTO.java
diff --git a/src/de/fernflower/code/instructions/GOTO_W.java b/src/org/jetbrains/java/decompiler/code/instructions/GOTO_W.java
similarity index 100%
rename from src/de/fernflower/code/instructions/GOTO_W.java
rename to src/org/jetbrains/java/decompiler/code/instructions/GOTO_W.java
diff --git a/src/de/fernflower/code/instructions/I2B.java b/src/org/jetbrains/java/decompiler/code/instructions/I2B.java
similarity index 100%
rename from src/de/fernflower/code/instructions/I2B.java
rename to src/org/jetbrains/java/decompiler/code/instructions/I2B.java
diff --git a/src/de/fernflower/code/instructions/I2C.java b/src/org/jetbrains/java/decompiler/code/instructions/I2C.java
similarity index 100%
rename from src/de/fernflower/code/instructions/I2C.java
rename to src/org/jetbrains/java/decompiler/code/instructions/I2C.java
diff --git a/src/de/fernflower/code/instructions/I2D.java b/src/org/jetbrains/java/decompiler/code/instructions/I2D.java
similarity index 100%
rename from src/de/fernflower/code/instructions/I2D.java
rename to src/org/jetbrains/java/decompiler/code/instructions/I2D.java
diff --git a/src/de/fernflower/code/instructions/I2F.java b/src/org/jetbrains/java/decompiler/code/instructions/I2F.java
similarity index 100%
rename from src/de/fernflower/code/instructions/I2F.java
rename to src/org/jetbrains/java/decompiler/code/instructions/I2F.java
diff --git a/src/de/fernflower/code/instructions/I2L.java b/src/org/jetbrains/java/decompiler/code/instructions/I2L.java
similarity index 100%
rename from src/de/fernflower/code/instructions/I2L.java
rename to src/org/jetbrains/java/decompiler/code/instructions/I2L.java
diff --git a/src/de/fernflower/code/instructions/I2S.java b/src/org/jetbrains/java/decompiler/code/instructions/I2S.java
similarity index 100%
rename from src/de/fernflower/code/instructions/I2S.java
rename to src/org/jetbrains/java/decompiler/code/instructions/I2S.java
diff --git a/src/de/fernflower/code/instructions/IADD.java b/src/org/jetbrains/java/decompiler/code/instructions/IADD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IADD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IADD.java
diff --git a/src/de/fernflower/code/instructions/IALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/IALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IALOAD.java
diff --git a/src/de/fernflower/code/instructions/IAND.java b/src/org/jetbrains/java/decompiler/code/instructions/IAND.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IAND.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IAND.java
diff --git a/src/de/fernflower/code/instructions/IASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/IASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IASTORE.java
diff --git a/src/de/fernflower/code/instructions/IDIV.java b/src/org/jetbrains/java/decompiler/code/instructions/IDIV.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IDIV.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IDIV.java
diff --git a/src/de/fernflower/code/instructions/IFEQ.java b/src/org/jetbrains/java/decompiler/code/instructions/IFEQ.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IFEQ.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IFEQ.java
diff --git a/src/de/fernflower/code/instructions/IFGE.java b/src/org/jetbrains/java/decompiler/code/instructions/IFGE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IFGE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IFGE.java
diff --git a/src/de/fernflower/code/instructions/IFGT.java b/src/org/jetbrains/java/decompiler/code/instructions/IFGT.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IFGT.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IFGT.java
diff --git a/src/de/fernflower/code/instructions/IFLE.java b/src/org/jetbrains/java/decompiler/code/instructions/IFLE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IFLE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IFLE.java
diff --git a/src/de/fernflower/code/instructions/IFLT.java b/src/org/jetbrains/java/decompiler/code/instructions/IFLT.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IFLT.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IFLT.java
diff --git a/src/de/fernflower/code/instructions/IFNE.java b/src/org/jetbrains/java/decompiler/code/instructions/IFNE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IFNE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IFNE.java
diff --git a/src/de/fernflower/code/instructions/IFNONNULL.java b/src/org/jetbrains/java/decompiler/code/instructions/IFNONNULL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IFNONNULL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IFNONNULL.java
diff --git a/src/de/fernflower/code/instructions/IFNULL.java b/src/org/jetbrains/java/decompiler/code/instructions/IFNULL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IFNULL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IFNULL.java
diff --git a/src/de/fernflower/code/instructions/IF_ACMPEQ.java b/src/org/jetbrains/java/decompiler/code/instructions/IF_ACMPEQ.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IF_ACMPEQ.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IF_ACMPEQ.java
diff --git a/src/de/fernflower/code/instructions/IF_ACMPNE.java b/src/org/jetbrains/java/decompiler/code/instructions/IF_ACMPNE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IF_ACMPNE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IF_ACMPNE.java
diff --git a/src/de/fernflower/code/instructions/IF_ICMPEQ.java b/src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPEQ.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IF_ICMPEQ.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPEQ.java
diff --git a/src/de/fernflower/code/instructions/IF_ICMPGE.java b/src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPGE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IF_ICMPGE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPGE.java
diff --git a/src/de/fernflower/code/instructions/IF_ICMPGT.java b/src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPGT.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IF_ICMPGT.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPGT.java
diff --git a/src/de/fernflower/code/instructions/IF_ICMPLE.java b/src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPLE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IF_ICMPLE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPLE.java
diff --git a/src/de/fernflower/code/instructions/IF_ICMPLT.java b/src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPLT.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IF_ICMPLT.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPLT.java
diff --git a/src/de/fernflower/code/instructions/IF_ICMPNE.java b/src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPNE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IF_ICMPNE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IF_ICMPNE.java
diff --git a/src/de/fernflower/code/instructions/IINC.java b/src/org/jetbrains/java/decompiler/code/instructions/IINC.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IINC.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IINC.java
diff --git a/src/de/fernflower/code/instructions/ILOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/ILOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ILOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ILOAD.java
diff --git a/src/de/fernflower/code/instructions/IMUL.java b/src/org/jetbrains/java/decompiler/code/instructions/IMUL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IMUL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IMUL.java
diff --git a/src/de/fernflower/code/instructions/INEG.java b/src/org/jetbrains/java/decompiler/code/instructions/INEG.java
similarity index 100%
rename from src/de/fernflower/code/instructions/INEG.java
rename to src/org/jetbrains/java/decompiler/code/instructions/INEG.java
diff --git a/src/de/fernflower/code/instructions/INSTANCEOF.java b/src/org/jetbrains/java/decompiler/code/instructions/INSTANCEOF.java
similarity index 100%
rename from src/de/fernflower/code/instructions/INSTANCEOF.java
rename to src/org/jetbrains/java/decompiler/code/instructions/INSTANCEOF.java
diff --git a/src/de/fernflower/code/instructions/INVOKEINTERFACE.java b/src/org/jetbrains/java/decompiler/code/instructions/INVOKEINTERFACE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/INVOKEINTERFACE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/INVOKEINTERFACE.java
diff --git a/src/de/fernflower/code/instructions/INVOKESPECIAL.java b/src/org/jetbrains/java/decompiler/code/instructions/INVOKESPECIAL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/INVOKESPECIAL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/INVOKESPECIAL.java
diff --git a/src/de/fernflower/code/instructions/INVOKESTATIC.java b/src/org/jetbrains/java/decompiler/code/instructions/INVOKESTATIC.java
similarity index 100%
rename from src/de/fernflower/code/instructions/INVOKESTATIC.java
rename to src/org/jetbrains/java/decompiler/code/instructions/INVOKESTATIC.java
diff --git a/src/de/fernflower/code/instructions/INVOKEVIRTUAL.java b/src/org/jetbrains/java/decompiler/code/instructions/INVOKEVIRTUAL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/INVOKEVIRTUAL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/INVOKEVIRTUAL.java
diff --git a/src/de/fernflower/code/instructions/IOR.java b/src/org/jetbrains/java/decompiler/code/instructions/IOR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IOR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IOR.java
diff --git a/src/de/fernflower/code/instructions/IREM.java b/src/org/jetbrains/java/decompiler/code/instructions/IREM.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IREM.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IREM.java
diff --git a/src/de/fernflower/code/instructions/IRETURN.java b/src/org/jetbrains/java/decompiler/code/instructions/IRETURN.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IRETURN.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IRETURN.java
diff --git a/src/de/fernflower/code/instructions/ISHL.java b/src/org/jetbrains/java/decompiler/code/instructions/ISHL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ISHL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ISHL.java
diff --git a/src/de/fernflower/code/instructions/ISHR.java b/src/org/jetbrains/java/decompiler/code/instructions/ISHR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ISHR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ISHR.java
diff --git a/src/de/fernflower/code/instructions/ISTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/ISTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ISTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ISTORE.java
diff --git a/src/de/fernflower/code/instructions/ISUB.java b/src/org/jetbrains/java/decompiler/code/instructions/ISUB.java
similarity index 100%
rename from src/de/fernflower/code/instructions/ISUB.java
rename to src/org/jetbrains/java/decompiler/code/instructions/ISUB.java
diff --git a/src/de/fernflower/code/instructions/IUSHR.java b/src/org/jetbrains/java/decompiler/code/instructions/IUSHR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IUSHR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IUSHR.java
diff --git a/src/de/fernflower/code/instructions/IXOR.java b/src/org/jetbrains/java/decompiler/code/instructions/IXOR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/IXOR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/IXOR.java
diff --git a/src/de/fernflower/code/instructions/JSR.java b/src/org/jetbrains/java/decompiler/code/instructions/JSR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/JSR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/JSR.java
diff --git a/src/de/fernflower/code/instructions/JSR_W.java b/src/org/jetbrains/java/decompiler/code/instructions/JSR_W.java
similarity index 100%
rename from src/de/fernflower/code/instructions/JSR_W.java
rename to src/org/jetbrains/java/decompiler/code/instructions/JSR_W.java
diff --git a/src/de/fernflower/code/instructions/L2D.java b/src/org/jetbrains/java/decompiler/code/instructions/L2D.java
similarity index 100%
rename from src/de/fernflower/code/instructions/L2D.java
rename to src/org/jetbrains/java/decompiler/code/instructions/L2D.java
diff --git a/src/de/fernflower/code/instructions/L2F.java b/src/org/jetbrains/java/decompiler/code/instructions/L2F.java
similarity index 100%
rename from src/de/fernflower/code/instructions/L2F.java
rename to src/org/jetbrains/java/decompiler/code/instructions/L2F.java
diff --git a/src/de/fernflower/code/instructions/L2I.java b/src/org/jetbrains/java/decompiler/code/instructions/L2I.java
similarity index 100%
rename from src/de/fernflower/code/instructions/L2I.java
rename to src/org/jetbrains/java/decompiler/code/instructions/L2I.java
diff --git a/src/de/fernflower/code/instructions/LADD.java b/src/org/jetbrains/java/decompiler/code/instructions/LADD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LADD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LADD.java
diff --git a/src/de/fernflower/code/instructions/LALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/LALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LALOAD.java
diff --git a/src/de/fernflower/code/instructions/LAND.java b/src/org/jetbrains/java/decompiler/code/instructions/LAND.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LAND.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LAND.java
diff --git a/src/de/fernflower/code/instructions/LASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/LASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LASTORE.java
diff --git a/src/de/fernflower/code/instructions/LCMP.java b/src/org/jetbrains/java/decompiler/code/instructions/LCMP.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LCMP.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LCMP.java
diff --git a/src/de/fernflower/code/instructions/LCONST_0.java b/src/org/jetbrains/java/decompiler/code/instructions/LCONST_0.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LCONST_0.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LCONST_0.java
diff --git a/src/de/fernflower/code/instructions/LCONST_1.java b/src/org/jetbrains/java/decompiler/code/instructions/LCONST_1.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LCONST_1.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LCONST_1.java
diff --git a/src/de/fernflower/code/instructions/LDC.java b/src/org/jetbrains/java/decompiler/code/instructions/LDC.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LDC.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LDC.java
diff --git a/src/de/fernflower/code/instructions/LDC2_W.java b/src/org/jetbrains/java/decompiler/code/instructions/LDC2_W.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LDC2_W.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LDC2_W.java
diff --git a/src/de/fernflower/code/instructions/LDC_W.java b/src/org/jetbrains/java/decompiler/code/instructions/LDC_W.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LDC_W.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LDC_W.java
diff --git a/src/de/fernflower/code/instructions/LDIV.java b/src/org/jetbrains/java/decompiler/code/instructions/LDIV.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LDIV.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LDIV.java
diff --git a/src/de/fernflower/code/instructions/LLOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/LLOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LLOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LLOAD.java
diff --git a/src/de/fernflower/code/instructions/LMUL.java b/src/org/jetbrains/java/decompiler/code/instructions/LMUL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LMUL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LMUL.java
diff --git a/src/de/fernflower/code/instructions/LNEG.java b/src/org/jetbrains/java/decompiler/code/instructions/LNEG.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LNEG.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LNEG.java
diff --git a/src/de/fernflower/code/instructions/LOOKUPSWITCH.java b/src/org/jetbrains/java/decompiler/code/instructions/LOOKUPSWITCH.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LOOKUPSWITCH.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LOOKUPSWITCH.java
diff --git a/src/de/fernflower/code/instructions/LOR.java b/src/org/jetbrains/java/decompiler/code/instructions/LOR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LOR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LOR.java
diff --git a/src/de/fernflower/code/instructions/LREM.java b/src/org/jetbrains/java/decompiler/code/instructions/LREM.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LREM.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LREM.java
diff --git a/src/de/fernflower/code/instructions/LRETURN.java b/src/org/jetbrains/java/decompiler/code/instructions/LRETURN.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LRETURN.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LRETURN.java
diff --git a/src/de/fernflower/code/instructions/LSHL.java b/src/org/jetbrains/java/decompiler/code/instructions/LSHL.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LSHL.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LSHL.java
diff --git a/src/de/fernflower/code/instructions/LSHR.java b/src/org/jetbrains/java/decompiler/code/instructions/LSHR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LSHR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LSHR.java
diff --git a/src/de/fernflower/code/instructions/LSTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/LSTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LSTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LSTORE.java
diff --git a/src/de/fernflower/code/instructions/LSUB.java b/src/org/jetbrains/java/decompiler/code/instructions/LSUB.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LSUB.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LSUB.java
diff --git a/src/de/fernflower/code/instructions/LUSHR.java b/src/org/jetbrains/java/decompiler/code/instructions/LUSHR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LUSHR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LUSHR.java
diff --git a/src/de/fernflower/code/instructions/LXOR.java b/src/org/jetbrains/java/decompiler/code/instructions/LXOR.java
similarity index 100%
rename from src/de/fernflower/code/instructions/LXOR.java
rename to src/org/jetbrains/java/decompiler/code/instructions/LXOR.java
diff --git a/src/de/fernflower/code/instructions/MONITORENTER.java b/src/org/jetbrains/java/decompiler/code/instructions/MONITORENTER.java
similarity index 100%
rename from src/de/fernflower/code/instructions/MONITORENTER.java
rename to src/org/jetbrains/java/decompiler/code/instructions/MONITORENTER.java
diff --git a/src/de/fernflower/code/instructions/MONITOREXIT.java b/src/org/jetbrains/java/decompiler/code/instructions/MONITOREXIT.java
similarity index 100%
rename from src/de/fernflower/code/instructions/MONITOREXIT.java
rename to src/org/jetbrains/java/decompiler/code/instructions/MONITOREXIT.java
diff --git a/src/de/fernflower/code/instructions/MULTIANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/instructions/MULTIANEWARRAY.java
similarity index 100%
rename from src/de/fernflower/code/instructions/MULTIANEWARRAY.java
rename to src/org/jetbrains/java/decompiler/code/instructions/MULTIANEWARRAY.java
diff --git a/src/de/fernflower/code/instructions/NEW.java b/src/org/jetbrains/java/decompiler/code/instructions/NEW.java
similarity index 100%
rename from src/de/fernflower/code/instructions/NEW.java
rename to src/org/jetbrains/java/decompiler/code/instructions/NEW.java
diff --git a/src/de/fernflower/code/instructions/NEWARRAY.java b/src/org/jetbrains/java/decompiler/code/instructions/NEWARRAY.java
similarity index 100%
rename from src/de/fernflower/code/instructions/NEWARRAY.java
rename to src/org/jetbrains/java/decompiler/code/instructions/NEWARRAY.java
diff --git a/src/de/fernflower/code/instructions/NOP.java b/src/org/jetbrains/java/decompiler/code/instructions/NOP.java
similarity index 100%
rename from src/de/fernflower/code/instructions/NOP.java
rename to src/org/jetbrains/java/decompiler/code/instructions/NOP.java
diff --git a/src/de/fernflower/code/instructions/POP.java b/src/org/jetbrains/java/decompiler/code/instructions/POP.java
similarity index 100%
rename from src/de/fernflower/code/instructions/POP.java
rename to src/org/jetbrains/java/decompiler/code/instructions/POP.java
diff --git a/src/de/fernflower/code/instructions/POP2.java b/src/org/jetbrains/java/decompiler/code/instructions/POP2.java
similarity index 100%
rename from src/de/fernflower/code/instructions/POP2.java
rename to src/org/jetbrains/java/decompiler/code/instructions/POP2.java
diff --git a/src/de/fernflower/code/instructions/PUTFIELD.java b/src/org/jetbrains/java/decompiler/code/instructions/PUTFIELD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/PUTFIELD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/PUTFIELD.java
diff --git a/src/de/fernflower/code/instructions/PUTSTATIC.java b/src/org/jetbrains/java/decompiler/code/instructions/PUTSTATIC.java
similarity index 100%
rename from src/de/fernflower/code/instructions/PUTSTATIC.java
rename to src/org/jetbrains/java/decompiler/code/instructions/PUTSTATIC.java
diff --git a/src/de/fernflower/code/instructions/RET.java b/src/org/jetbrains/java/decompiler/code/instructions/RET.java
similarity index 100%
rename from src/de/fernflower/code/instructions/RET.java
rename to src/org/jetbrains/java/decompiler/code/instructions/RET.java
diff --git a/src/de/fernflower/code/instructions/RETURN.java b/src/org/jetbrains/java/decompiler/code/instructions/RETURN.java
similarity index 100%
rename from src/de/fernflower/code/instructions/RETURN.java
rename to src/org/jetbrains/java/decompiler/code/instructions/RETURN.java
diff --git a/src/de/fernflower/code/instructions/SALOAD.java b/src/org/jetbrains/java/decompiler/code/instructions/SALOAD.java
similarity index 100%
rename from src/de/fernflower/code/instructions/SALOAD.java
rename to src/org/jetbrains/java/decompiler/code/instructions/SALOAD.java
diff --git a/src/de/fernflower/code/instructions/SASTORE.java b/src/org/jetbrains/java/decompiler/code/instructions/SASTORE.java
similarity index 100%
rename from src/de/fernflower/code/instructions/SASTORE.java
rename to src/org/jetbrains/java/decompiler/code/instructions/SASTORE.java
diff --git a/src/de/fernflower/code/instructions/SIPUSH.java b/src/org/jetbrains/java/decompiler/code/instructions/SIPUSH.java
similarity index 100%
rename from src/de/fernflower/code/instructions/SIPUSH.java
rename to src/org/jetbrains/java/decompiler/code/instructions/SIPUSH.java
diff --git a/src/de/fernflower/code/instructions/SWAP.java b/src/org/jetbrains/java/decompiler/code/instructions/SWAP.java
similarity index 100%
rename from src/de/fernflower/code/instructions/SWAP.java
rename to src/org/jetbrains/java/decompiler/code/instructions/SWAP.java
diff --git a/src/de/fernflower/code/instructions/TABLESWITCH.java b/src/org/jetbrains/java/decompiler/code/instructions/TABLESWITCH.java
similarity index 100%
rename from src/de/fernflower/code/instructions/TABLESWITCH.java
rename to src/org/jetbrains/java/decompiler/code/instructions/TABLESWITCH.java
diff --git a/src/de/fernflower/code/instructions/XXXUNUSEDXXX.java b/src/org/jetbrains/java/decompiler/code/instructions/XXXUNUSEDXXX.java
similarity index 100%
rename from src/de/fernflower/code/instructions/XXXUNUSEDXXX.java
rename to src/org/jetbrains/java/decompiler/code/instructions/XXXUNUSEDXXX.java
diff --git a/src/de/fernflower/code/interpreter/InstructionImpact.java b/src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
similarity index 100%
rename from src/de/fernflower/code/interpreter/InstructionImpact.java
rename to src/org/jetbrains/java/decompiler/code/interpreter/InstructionImpact.java
diff --git a/src/de/fernflower/code/interpreter/Util.java b/src/org/jetbrains/java/decompiler/code/interpreter/Util.java
similarity index 100%
rename from src/de/fernflower/code/interpreter/Util.java
rename to src/org/jetbrains/java/decompiler/code/interpreter/Util.java
diff --git a/src/de/fernflower/code/optinstructions/ALOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/ALOAD.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/ALOAD.java
diff --git a/src/de/fernflower/code/optinstructions/ANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/ANEWARRAY.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/ANEWARRAY.java
diff --git a/src/de/fernflower/code/optinstructions/ASTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/ASTORE.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/ASTORE.java
diff --git a/src/de/fernflower/code/optinstructions/BIPUSH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/BIPUSH.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/BIPUSH.java
diff --git a/src/de/fernflower/code/optinstructions/CHECKCAST.java b/src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/CHECKCAST.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/CHECKCAST.java
diff --git a/src/de/fernflower/code/optinstructions/DLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/DLOAD.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/DLOAD.java
diff --git a/src/de/fernflower/code/optinstructions/DSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/DSTORE.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/DSTORE.java
diff --git a/src/de/fernflower/code/optinstructions/FLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/FLOAD.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/FLOAD.java
diff --git a/src/de/fernflower/code/optinstructions/FSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/FSTORE.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/FSTORE.java
diff --git a/src/de/fernflower/code/optinstructions/GETFIELD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/GETFIELD.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/GETFIELD.java
diff --git a/src/de/fernflower/code/optinstructions/GETSTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/GETSTATIC.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/GETSTATIC.java
diff --git a/src/de/fernflower/code/optinstructions/GOTO.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/GOTO.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/GOTO.java
diff --git a/src/de/fernflower/code/optinstructions/GOTO_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/GOTO_W.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/GOTO_W.java
diff --git a/src/de/fernflower/code/optinstructions/IINC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/IINC.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/IINC.java
diff --git a/src/de/fernflower/code/optinstructions/ILOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/ILOAD.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/ILOAD.java
diff --git a/src/de/fernflower/code/optinstructions/INSTANCEOF.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/INSTANCEOF.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/INSTANCEOF.java
diff --git a/src/de/fernflower/code/optinstructions/INVOKEDYNAMIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/INVOKEDYNAMIC.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEDYNAMIC.java
diff --git a/src/de/fernflower/code/optinstructions/INVOKEINTERFACE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/INVOKEINTERFACE.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEINTERFACE.java
diff --git a/src/de/fernflower/code/optinstructions/INVOKESPECIAL.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/INVOKESPECIAL.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESPECIAL.java
diff --git a/src/de/fernflower/code/optinstructions/INVOKESTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/INVOKESTATIC.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/INVOKESTATIC.java
diff --git a/src/de/fernflower/code/optinstructions/INVOKEVIRTUAL.java b/src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/INVOKEVIRTUAL.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/INVOKEVIRTUAL.java
diff --git a/src/de/fernflower/code/optinstructions/ISTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/ISTORE.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/ISTORE.java
diff --git a/src/de/fernflower/code/optinstructions/JSR.java b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/JSR.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/JSR.java
diff --git a/src/de/fernflower/code/optinstructions/JSR_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/JSR_W.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/JSR_W.java
diff --git a/src/de/fernflower/code/optinstructions/LDC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/LDC.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/LDC.java
diff --git a/src/de/fernflower/code/optinstructions/LDC2_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/LDC2_W.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/LDC2_W.java
diff --git a/src/de/fernflower/code/optinstructions/LDC_W.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/LDC_W.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/LDC_W.java
diff --git a/src/de/fernflower/code/optinstructions/LLOAD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/LLOAD.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/LLOAD.java
diff --git a/src/de/fernflower/code/optinstructions/LOOKUPSWITCH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/LOOKUPSWITCH.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/LOOKUPSWITCH.java
diff --git a/src/de/fernflower/code/optinstructions/LSTORE.java b/src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/LSTORE.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/LSTORE.java
diff --git a/src/de/fernflower/code/optinstructions/MULTIANEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/MULTIANEWARRAY.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/MULTIANEWARRAY.java
diff --git a/src/de/fernflower/code/optinstructions/NEW.java b/src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/NEW.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/NEW.java
diff --git a/src/de/fernflower/code/optinstructions/NEWARRAY.java b/src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/NEWARRAY.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/NEWARRAY.java
diff --git a/src/de/fernflower/code/optinstructions/PUTFIELD.java b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/PUTFIELD.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/PUTFIELD.java
diff --git a/src/de/fernflower/code/optinstructions/PUTSTATIC.java b/src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/PUTSTATIC.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/PUTSTATIC.java
diff --git a/src/de/fernflower/code/optinstructions/RET.java b/src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/RET.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/RET.java
diff --git a/src/de/fernflower/code/optinstructions/SIPUSH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/SIPUSH.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/SIPUSH.java
diff --git a/src/de/fernflower/code/optinstructions/TABLESWITCH.java b/src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
similarity index 100%
rename from src/de/fernflower/code/optinstructions/TABLESWITCH.java
rename to src/org/jetbrains/java/decompiler/code/optinstructions/TABLESWITCH.java
diff --git a/src/de/fernflower/main/AssertProcessor.java b/src/org/jetbrains/java/decompiler/main/AssertProcessor.java
similarity index 100%
rename from src/de/fernflower/main/AssertProcessor.java
rename to src/org/jetbrains/java/decompiler/main/AssertProcessor.java
diff --git a/src/de/fernflower/main/ClassReference14Processor.java b/src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
similarity index 100%
rename from src/de/fernflower/main/ClassReference14Processor.java
rename to src/org/jetbrains/java/decompiler/main/ClassReference14Processor.java
diff --git a/src/de/fernflower/main/ClassWriter.java b/src/org/jetbrains/java/decompiler/main/ClassWriter.java
similarity index 100%
rename from src/de/fernflower/main/ClassWriter.java
rename to src/org/jetbrains/java/decompiler/main/ClassWriter.java
diff --git a/src/de/fernflower/main/ClassesProcessor.java b/src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
similarity index 100%
rename from src/de/fernflower/main/ClassesProcessor.java
rename to src/org/jetbrains/java/decompiler/main/ClassesProcessor.java
diff --git a/src/de/fernflower/main/DecompilerContext.java b/src/org/jetbrains/java/decompiler/main/DecompilerContext.java
similarity index 100%
rename from src/de/fernflower/main/DecompilerContext.java
rename to src/org/jetbrains/java/decompiler/main/DecompilerContext.java
diff --git a/src/de/fernflower/main/EnumProcessor.java b/src/org/jetbrains/java/decompiler/main/EnumProcessor.java
similarity index 100%
rename from src/de/fernflower/main/EnumProcessor.java
rename to src/org/jetbrains/java/decompiler/main/EnumProcessor.java
diff --git a/src/de/fernflower/main/Fernflower.java b/src/org/jetbrains/java/decompiler/main/Fernflower.java
similarity index 100%
rename from src/de/fernflower/main/Fernflower.java
rename to src/org/jetbrains/java/decompiler/main/Fernflower.java
diff --git a/src/de/fernflower/main/InitializerProcessor.java b/src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
similarity index 100%
rename from src/de/fernflower/main/InitializerProcessor.java
rename to src/org/jetbrains/java/decompiler/main/InitializerProcessor.java
diff --git a/src/de/fernflower/main/collectors/CounterContainer.java b/src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
similarity index 100%
rename from src/de/fernflower/main/collectors/CounterContainer.java
rename to src/org/jetbrains/java/decompiler/main/collectors/CounterContainer.java
diff --git a/src/de/fernflower/main/collectors/ImportCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
similarity index 100%
rename from src/de/fernflower/main/collectors/ImportCollector.java
rename to src/org/jetbrains/java/decompiler/main/collectors/ImportCollector.java
diff --git a/src/de/fernflower/main/collectors/VarNamesCollector.java b/src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
similarity index 100%
rename from src/de/fernflower/main/collectors/VarNamesCollector.java
rename to src/org/jetbrains/java/decompiler/main/collectors/VarNamesCollector.java
diff --git a/src/de/fernflower/main/decompiler/ConsoleDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
similarity index 100%
rename from src/de/fernflower/main/decompiler/ConsoleDecompiler.java
rename to src/org/jetbrains/java/decompiler/main/decompiler/ConsoleDecompiler.java
diff --git a/src/de/fernflower/main/decompiler/IdeDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/IdeDecompiler.java
similarity index 100%
rename from src/de/fernflower/main/decompiler/IdeDecompiler.java
rename to src/org/jetbrains/java/decompiler/main/decompiler/IdeDecompiler.java
diff --git a/src/de/fernflower/main/decompiler/WebDecompiler.java b/src/org/jetbrains/java/decompiler/main/decompiler/WebDecompiler.java
similarity index 100%
rename from src/de/fernflower/main/decompiler/WebDecompiler.java
rename to src/org/jetbrains/java/decompiler/main/decompiler/WebDecompiler.java
diff --git a/src/de/fernflower/main/decompiler/helper/PrintStreamLogger.java b/src/org/jetbrains/java/decompiler/main/decompiler/helper/PrintStreamLogger.java
similarity index 100%
rename from src/de/fernflower/main/decompiler/helper/PrintStreamLogger.java
rename to src/org/jetbrains/java/decompiler/main/decompiler/helper/PrintStreamLogger.java
diff --git a/src/de/fernflower/main/extern/IBytecodeProvider.java b/src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
similarity index 100%
rename from src/de/fernflower/main/extern/IBytecodeProvider.java
rename to src/org/jetbrains/java/decompiler/main/extern/IBytecodeProvider.java
diff --git a/src/de/fernflower/main/extern/IDecompilatSaver.java b/src/org/jetbrains/java/decompiler/main/extern/IDecompilatSaver.java
similarity index 100%
rename from src/de/fernflower/main/extern/IDecompilatSaver.java
rename to src/org/jetbrains/java/decompiler/main/extern/IDecompilatSaver.java
diff --git a/src/de/fernflower/main/extern/IFernflowerLogger.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
similarity index 100%
rename from src/de/fernflower/main/extern/IFernflowerLogger.java
rename to src/org/jetbrains/java/decompiler/main/extern/IFernflowerLogger.java
diff --git a/src/de/fernflower/main/extern/IFernflowerPreferences.java b/src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
similarity index 100%
rename from src/de/fernflower/main/extern/IFernflowerPreferences.java
rename to src/org/jetbrains/java/decompiler/main/extern/IFernflowerPreferences.java
diff --git a/src/de/fernflower/main/extern/IIdentifierRenamer.java b/src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java
similarity index 100%
rename from src/de/fernflower/main/extern/IIdentifierRenamer.java
rename to src/org/jetbrains/java/decompiler/main/extern/IIdentifierRenamer.java
diff --git a/src/de/fernflower/main/rels/ClassWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
similarity index 100%
rename from src/de/fernflower/main/rels/ClassWrapper.java
rename to src/org/jetbrains/java/decompiler/main/rels/ClassWrapper.java
diff --git a/src/de/fernflower/main/rels/LambdaProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
similarity index 100%
rename from src/de/fernflower/main/rels/LambdaProcessor.java
rename to src/org/jetbrains/java/decompiler/main/rels/LambdaProcessor.java
diff --git a/src/de/fernflower/main/rels/MethodProcessorThread.java b/src/org/jetbrains/java/decompiler/main/rels/MethodProcessorThread.java
similarity index 100%
rename from src/de/fernflower/main/rels/MethodProcessorThread.java
rename to src/org/jetbrains/java/decompiler/main/rels/MethodProcessorThread.java
diff --git a/src/de/fernflower/main/rels/MethodWrapper.java b/src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
similarity index 100%
rename from src/de/fernflower/main/rels/MethodWrapper.java
rename to src/org/jetbrains/java/decompiler/main/rels/MethodWrapper.java
diff --git a/src/de/fernflower/main/rels/NestedClassProcessor.java b/src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
similarity index 100%
rename from src/de/fernflower/main/rels/NestedClassProcessor.java
rename to src/org/jetbrains/java/decompiler/main/rels/NestedClassProcessor.java
diff --git a/src/de/fernflower/main/rels/NestedMemberAccess.java b/src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
similarity index 100%
rename from src/de/fernflower/main/rels/NestedMemberAccess.java
rename to src/org/jetbrains/java/decompiler/main/rels/NestedMemberAccess.java
diff --git a/src/de/fernflower/modules/code/DeadCodeHelper.java b/src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
similarity index 100%
rename from src/de/fernflower/modules/code/DeadCodeHelper.java
rename to src/org/jetbrains/java/decompiler/modules/code/DeadCodeHelper.java
diff --git a/src/de/fernflower/modules/decompiler/ClearStructHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/ClearStructHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/ClearStructHelper.java
diff --git a/src/de/fernflower/modules/decompiler/ConcatenationHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/ConcatenationHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/ConcatenationHelper.java
diff --git a/src/de/fernflower/modules/decompiler/DecHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/DecHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/DecHelper.java
diff --git a/src/de/fernflower/modules/decompiler/DomHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/DomHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/DomHelper.java
diff --git a/src/de/fernflower/modules/decompiler/EliminateLoopsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/EliminateLoopsHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/EliminateLoopsHelper.java
diff --git a/src/de/fernflower/modules/decompiler/ExitHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/ExitHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/ExitHelper.java
diff --git a/src/de/fernflower/modules/decompiler/ExprProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/ExprProcessor.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/ExprProcessor.java
diff --git a/src/de/fernflower/modules/decompiler/ExprentStack.java b/src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/ExprentStack.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/ExprentStack.java
diff --git a/src/de/fernflower/modules/decompiler/FinallyProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/FinallyProcessor.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/FinallyProcessor.java
diff --git a/src/de/fernflower/modules/decompiler/IdeaNotNullHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/IdeaNotNullHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/IdeaNotNullHelper.java
diff --git a/src/de/fernflower/modules/decompiler/IfHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/IfHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/IfHelper.java
diff --git a/src/de/fernflower/modules/decompiler/InlineSingleBlockHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/InlineSingleBlockHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/InlineSingleBlockHelper.java
diff --git a/src/de/fernflower/modules/decompiler/LabelHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/LabelHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/LabelHelper.java
diff --git a/src/de/fernflower/modules/decompiler/LoopExtractHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/LoopExtractHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/LoopExtractHelper.java
diff --git a/src/de/fernflower/modules/decompiler/LowBreakHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/LowBreakHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/LowBreakHelper.java
diff --git a/src/de/fernflower/modules/decompiler/MergeHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/MergeHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/MergeHelper.java
diff --git a/src/de/fernflower/modules/decompiler/PPandMMHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/PPandMMHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/PPandMMHelper.java
diff --git a/src/de/fernflower/modules/decompiler/PrimitiveExprsList.java b/src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/PrimitiveExprsList.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/PrimitiveExprsList.java
diff --git a/src/de/fernflower/modules/decompiler/SecondaryFunctionsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/SecondaryFunctionsHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/SecondaryFunctionsHelper.java
diff --git a/src/de/fernflower/modules/decompiler/SequenceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/SequenceHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/SequenceHelper.java
diff --git a/src/de/fernflower/modules/decompiler/SimplifyExprentsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/SimplifyExprentsHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/SimplifyExprentsHelper.java
diff --git a/src/de/fernflower/modules/decompiler/StackVarsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/StackVarsProcessor.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/StackVarsProcessor.java
diff --git a/src/de/fernflower/modules/decompiler/StatEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/StatEdge.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/StatEdge.java
diff --git a/src/de/fernflower/modules/decompiler/StrongConnectivityHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/StrongConnectivityHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/StrongConnectivityHelper.java
diff --git a/src/de/fernflower/modules/decompiler/decompose/DominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/decompose/DominatorEngine.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorEngine.java
diff --git a/src/de/fernflower/modules/decompiler/decompose/DominatorTreeExceptionFilter.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/decompose/DominatorTreeExceptionFilter.java
diff --git a/src/de/fernflower/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/decompose/FastExtendedPostdominanceHelper.java
diff --git a/src/de/fernflower/modules/decompiler/decompose/GenericDominatorEngine.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/decompose/GenericDominatorEngine.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/decompose/GenericDominatorEngine.java
diff --git a/src/de/fernflower/modules/decompiler/decompose/IGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/decompose/IGraph.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraph.java
diff --git a/src/de/fernflower/modules/decompiler/decompose/IGraphNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/decompose/IGraphNode.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/decompose/IGraphNode.java
diff --git a/src/de/fernflower/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/ExceptionDeobfuscator.java
diff --git a/src/de/fernflower/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java b/src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/deobfuscator/IrreducibleCFGDeobfuscator.java
diff --git a/src/de/fernflower/modules/decompiler/exps/AnnotationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/AnnotationExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/AnnotationExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/ArrayExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/ArrayExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/ArrayExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/AssertExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/AssertExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssertExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/AssignmentExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/AssignmentExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/AssignmentExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/ConstExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/ConstExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/ConstExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/ExitExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/ExitExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/ExitExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/Exprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/Exprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/Exprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/FieldExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/FieldExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/FieldExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/FunctionExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/FunctionExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/FunctionExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/IfExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/IfExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/IfExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/InvocationExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/InvocationExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/InvocationExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/MonitorExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/MonitorExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/MonitorExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/NewExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/NewExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/NewExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/SwitchExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/SwitchExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/SwitchExprent.java
diff --git a/src/de/fernflower/modules/decompiler/exps/VarExprent.java b/src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/exps/VarExprent.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/exps/VarExprent.java
diff --git a/src/de/fernflower/modules/decompiler/sforms/DirectGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/sforms/DirectGraph.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectGraph.java
diff --git a/src/de/fernflower/modules/decompiler/sforms/DirectNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/sforms/DirectNode.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/sforms/DirectNode.java
diff --git a/src/de/fernflower/modules/decompiler/sforms/FlattenStatementsHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/sforms/FlattenStatementsHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/sforms/FlattenStatementsHelper.java
diff --git a/src/de/fernflower/modules/decompiler/sforms/SSAConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/sforms/SSAConstructorSparseEx.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAConstructorSparseEx.java
diff --git a/src/de/fernflower/modules/decompiler/sforms/SSAUConstructorSparseEx.java b/src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/sforms/SSAUConstructorSparseEx.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/sforms/SSAUConstructorSparseEx.java
diff --git a/src/de/fernflower/modules/decompiler/stats/BasicBlockStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/BasicBlockStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/BasicBlockStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/CatchAllStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/CatchAllStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchAllStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/CatchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/CatchStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/CatchStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/DoStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/DoStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/DoStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/GeneralStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/GeneralStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/GeneralStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/IfStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/IfStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/IfStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/RootStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/RootStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/RootStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/SequenceStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/SequenceStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/SequenceStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/Statement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/Statement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/Statement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/SwitchStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/SwitchStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/SwitchStatement.java
diff --git a/src/de/fernflower/modules/decompiler/stats/SynchronizedStatement.java b/src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/stats/SynchronizedStatement.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/stats/SynchronizedStatement.java
diff --git a/src/de/fernflower/modules/decompiler/vars/CheckTypesResult.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/CheckTypesResult.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/CheckTypesResult.java
diff --git a/src/de/fernflower/modules/decompiler/vars/VarDefinitionHelper.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/VarDefinitionHelper.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarDefinitionHelper.java
diff --git a/src/de/fernflower/modules/decompiler/vars/VarProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/VarProcessor.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarProcessor.java
diff --git a/src/de/fernflower/modules/decompiler/vars/VarTypeProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/VarTypeProcessor.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarTypeProcessor.java
diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionEdge.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/VarVersionEdge.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionEdge.java
diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionNode.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/VarVersionNode.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionNode.java
diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionPaar.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPaar.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/VarVersionPaar.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionPaar.java
diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionsGraph.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/VarVersionsGraph.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsGraph.java
diff --git a/src/de/fernflower/modules/decompiler/vars/VarVersionsProcessor.java b/src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
similarity index 100%
rename from src/de/fernflower/modules/decompiler/vars/VarVersionsProcessor.java
rename to src/org/jetbrains/java/decompiler/modules/decompiler/vars/VarVersionsProcessor.java
diff --git a/src/de/fernflower/modules/renamer/ClassWrapperNode.java b/src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
similarity index 100%
rename from src/de/fernflower/modules/renamer/ClassWrapperNode.java
rename to src/org/jetbrains/java/decompiler/modules/renamer/ClassWrapperNode.java
diff --git a/src/de/fernflower/modules/renamer/ConverterHelper.java b/src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
similarity index 100%
rename from src/de/fernflower/modules/renamer/ConverterHelper.java
rename to src/org/jetbrains/java/decompiler/modules/renamer/ConverterHelper.java
diff --git a/src/de/fernflower/modules/renamer/IdentifierConverter.java b/src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
similarity index 100%
rename from src/de/fernflower/modules/renamer/IdentifierConverter.java
rename to src/org/jetbrains/java/decompiler/modules/renamer/IdentifierConverter.java
diff --git a/src/de/fernflower/modules/renamer/PoolInterceptor.java b/src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
similarity index 100%
rename from src/de/fernflower/modules/renamer/PoolInterceptor.java
rename to src/org/jetbrains/java/decompiler/modules/renamer/PoolInterceptor.java
diff --git a/src/de/fernflower/struct/ContextUnit.java b/src/org/jetbrains/java/decompiler/struct/ContextUnit.java
similarity index 100%
rename from src/de/fernflower/struct/ContextUnit.java
rename to src/org/jetbrains/java/decompiler/struct/ContextUnit.java
diff --git a/src/de/fernflower/struct/IDecompiledData.java b/src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
similarity index 100%
rename from src/de/fernflower/struct/IDecompiledData.java
rename to src/org/jetbrains/java/decompiler/struct/IDecompiledData.java
diff --git a/src/de/fernflower/struct/ISaveClass.java b/src/org/jetbrains/java/decompiler/struct/ISaveClass.java
similarity index 100%
rename from src/de/fernflower/struct/ISaveClass.java
rename to src/org/jetbrains/java/decompiler/struct/ISaveClass.java
diff --git a/src/de/fernflower/struct/StructClass.java b/src/org/jetbrains/java/decompiler/struct/StructClass.java
similarity index 100%
rename from src/de/fernflower/struct/StructClass.java
rename to src/org/jetbrains/java/decompiler/struct/StructClass.java
diff --git a/src/de/fernflower/struct/StructContext.java b/src/org/jetbrains/java/decompiler/struct/StructContext.java
similarity index 100%
rename from src/de/fernflower/struct/StructContext.java
rename to src/org/jetbrains/java/decompiler/struct/StructContext.java
diff --git a/src/de/fernflower/struct/StructField.java b/src/org/jetbrains/java/decompiler/struct/StructField.java
similarity index 100%
rename from src/de/fernflower/struct/StructField.java
rename to src/org/jetbrains/java/decompiler/struct/StructField.java
diff --git a/src/de/fernflower/struct/StructMethod.java b/src/org/jetbrains/java/decompiler/struct/StructMethod.java
similarity index 100%
rename from src/de/fernflower/struct/StructMethod.java
rename to src/org/jetbrains/java/decompiler/struct/StructMethod.java
diff --git a/src/de/fernflower/struct/attr/StructAnnDefaultAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructAnnDefaultAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructAnnDefaultAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructAnnotationAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructAnnotationAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructAnnotationParameterAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructAnnotationParameterAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationParameterAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructAnnotationTypeAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructAnnotationTypeAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructAnnotationTypeAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructBootstrapMethodsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructBootstrapMethodsAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructBootstrapMethodsAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructConstantValueAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructConstantValueAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructConstantValueAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructEnclosingMethodAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructEnclosingMethodAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructEnclosingMethodAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructExceptionsAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructExceptionsAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructExceptionsAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructGeneralAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructGeneralAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructGeneralAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructGenericSignatureAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructGenericSignatureAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructGenericSignatureAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructInnerClassesAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructInnerClassesAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructInnerClassesAttribute.java
diff --git a/src/de/fernflower/struct/attr/StructLocalVariableTableAttribute.java b/src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
similarity index 100%
rename from src/de/fernflower/struct/attr/StructLocalVariableTableAttribute.java
rename to src/org/jetbrains/java/decompiler/struct/attr/StructLocalVariableTableAttribute.java
diff --git a/src/de/fernflower/struct/consts/ConstantPool.java b/src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
similarity index 100%
rename from src/de/fernflower/struct/consts/ConstantPool.java
rename to src/org/jetbrains/java/decompiler/struct/consts/ConstantPool.java
diff --git a/src/de/fernflower/struct/consts/LinkConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
similarity index 100%
rename from src/de/fernflower/struct/consts/LinkConstant.java
rename to src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java
diff --git a/src/de/fernflower/struct/consts/PooledConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
similarity index 100%
rename from src/de/fernflower/struct/consts/PooledConstant.java
rename to src/org/jetbrains/java/decompiler/struct/consts/PooledConstant.java
diff --git a/src/de/fernflower/struct/consts/PrimitiveConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
similarity index 100%
rename from src/de/fernflower/struct/consts/PrimitiveConstant.java
rename to src/org/jetbrains/java/decompiler/struct/consts/PrimitiveConstant.java
diff --git a/src/de/fernflower/struct/consts/VariableTypeEnum.java b/src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
similarity index 100%
rename from src/de/fernflower/struct/consts/VariableTypeEnum.java
rename to src/org/jetbrains/java/decompiler/struct/consts/VariableTypeEnum.java
diff --git a/src/de/fernflower/struct/gen/DataPoint.java b/src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
similarity index 100%
rename from src/de/fernflower/struct/gen/DataPoint.java
rename to src/org/jetbrains/java/decompiler/struct/gen/DataPoint.java
diff --git a/src/de/fernflower/struct/gen/FieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
similarity index 100%
rename from src/de/fernflower/struct/gen/FieldDescriptor.java
rename to src/org/jetbrains/java/decompiler/struct/gen/FieldDescriptor.java
diff --git a/src/de/fernflower/struct/gen/MethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
similarity index 100%
rename from src/de/fernflower/struct/gen/MethodDescriptor.java
rename to src/org/jetbrains/java/decompiler/struct/gen/MethodDescriptor.java
diff --git a/src/de/fernflower/struct/gen/VarType.java b/src/org/jetbrains/java/decompiler/struct/gen/VarType.java
similarity index 100%
rename from src/de/fernflower/struct/gen/VarType.java
rename to src/org/jetbrains/java/decompiler/struct/gen/VarType.java
diff --git a/src/de/fernflower/struct/gen/generics/GenericClassDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
similarity index 100%
rename from src/de/fernflower/struct/gen/generics/GenericClassDescriptor.java
rename to src/org/jetbrains/java/decompiler/struct/gen/generics/GenericClassDescriptor.java
diff --git a/src/de/fernflower/struct/gen/generics/GenericFieldDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
similarity index 100%
rename from src/de/fernflower/struct/gen/generics/GenericFieldDescriptor.java
rename to src/org/jetbrains/java/decompiler/struct/gen/generics/GenericFieldDescriptor.java
diff --git a/src/de/fernflower/struct/gen/generics/GenericMain.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
similarity index 100%
rename from src/de/fernflower/struct/gen/generics/GenericMain.java
rename to src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMain.java
diff --git a/src/de/fernflower/struct/gen/generics/GenericMethodDescriptor.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
similarity index 100%
rename from src/de/fernflower/struct/gen/generics/GenericMethodDescriptor.java
rename to src/org/jetbrains/java/decompiler/struct/gen/generics/GenericMethodDescriptor.java
diff --git a/src/de/fernflower/struct/gen/generics/GenericType.java b/src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
similarity index 100%
rename from src/de/fernflower/struct/gen/generics/GenericType.java
rename to src/org/jetbrains/java/decompiler/struct/gen/generics/GenericType.java
diff --git a/src/de/fernflower/struct/lazy/LazyLoader.java b/src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
similarity index 100%
rename from src/de/fernflower/struct/lazy/LazyLoader.java
rename to src/org/jetbrains/java/decompiler/struct/lazy/LazyLoader.java
diff --git a/src/de/fernflower/util/DataInputFullStream.java b/src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
similarity index 100%
rename from src/de/fernflower/util/DataInputFullStream.java
rename to src/org/jetbrains/java/decompiler/util/DataInputFullStream.java
diff --git a/src/de/fernflower/util/FastFixedSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
similarity index 100%
rename from src/de/fernflower/util/FastFixedSetFactory.java
rename to src/org/jetbrains/java/decompiler/util/FastFixedSetFactory.java
diff --git a/src/de/fernflower/util/FastSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSetFactory.java
similarity index 100%
rename from src/de/fernflower/util/FastSetFactory.java
rename to src/org/jetbrains/java/decompiler/util/FastSetFactory.java
diff --git a/src/de/fernflower/util/FastSparseSetFactory.java b/src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
similarity index 100%
rename from src/de/fernflower/util/FastSparseSetFactory.java
rename to src/org/jetbrains/java/decompiler/util/FastSparseSetFactory.java
diff --git a/src/de/fernflower/util/InterpreterUtil.java b/src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
similarity index 100%
rename from src/de/fernflower/util/InterpreterUtil.java
rename to src/org/jetbrains/java/decompiler/util/InterpreterUtil.java
diff --git a/src/de/fernflower/util/ListStack.java b/src/org/jetbrains/java/decompiler/util/ListStack.java
similarity index 100%
rename from src/de/fernflower/util/ListStack.java
rename to src/org/jetbrains/java/decompiler/util/ListStack.java
diff --git a/src/de/fernflower/util/SFormsFastMap.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMap.java
similarity index 100%
rename from src/de/fernflower/util/SFormsFastMap.java
rename to src/org/jetbrains/java/decompiler/util/SFormsFastMap.java
diff --git a/src/de/fernflower/util/SFormsFastMapDirect.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
similarity index 100%
rename from src/de/fernflower/util/SFormsFastMapDirect.java
rename to src/org/jetbrains/java/decompiler/util/SFormsFastMapDirect.java
diff --git a/src/de/fernflower/util/SFormsFastMapOld.java b/src/org/jetbrains/java/decompiler/util/SFormsFastMapOld.java
similarity index 100%
rename from src/de/fernflower/util/SFormsFastMapOld.java
rename to src/org/jetbrains/java/decompiler/util/SFormsFastMapOld.java
diff --git a/src/de/fernflower/util/VBStyleCollection.java b/src/org/jetbrains/java/decompiler/util/VBStyleCollection.java
similarity index 100%
rename from src/de/fernflower/util/VBStyleCollection.java
rename to src/org/jetbrains/java/decompiler/util/VBStyleCollection.java