diff --git a/Main.java b/classes/Main.java
similarity index 100%
rename from Main.java
rename to classes/Main.java
diff --git a/filesystem/iso9660/ByteParser.java b/classes/filesystem/iso9660/ByteParser.java
similarity index 100%
rename from filesystem/iso9660/ByteParser.java
rename to classes/filesystem/iso9660/ByteParser.java
diff --git a/filesystem/iso9660/DirectoryRecord.java b/classes/filesystem/iso9660/DirectoryRecord.java
similarity index 100%
rename from filesystem/iso9660/DirectoryRecord.java
rename to classes/filesystem/iso9660/DirectoryRecord.java
diff --git a/filesystem/iso9660/DirectoryRecordHandler.java b/classes/filesystem/iso9660/DirectoryRecordHandler.java
similarity index 100%
rename from filesystem/iso9660/DirectoryRecordHandler.java
rename to classes/filesystem/iso9660/DirectoryRecordHandler.java
diff --git a/filesystem/iso9660/ExtentReader.java b/classes/filesystem/iso9660/ExtentReader.java
similarity index 100%
rename from filesystem/iso9660/ExtentReader.java
rename to classes/filesystem/iso9660/ExtentReader.java
diff --git a/filesystem/iso9660/PrimaryVolumeDescriptor.java b/classes/filesystem/iso9660/PrimaryVolumeDescriptor.java
similarity index 100%
rename from filesystem/iso9660/PrimaryVolumeDescriptor.java
rename to classes/filesystem/iso9660/PrimaryVolumeDescriptor.java
diff --git a/filesystem/iso9660/TestExtentReader.java b/classes/filesystem/iso9660/TestExtentReader.java
similarity index 100%
rename from filesystem/iso9660/TestExtentReader.java
rename to classes/filesystem/iso9660/TestExtentReader.java
diff --git a/filesystem/iso9660/VolumeParser.java b/classes/filesystem/iso9660/VolumeParser.java
similarity index 100%
rename from filesystem/iso9660/VolumeParser.java
rename to classes/filesystem/iso9660/VolumeParser.java
diff --git a/java/io/PrintStream.java b/classes/java/io/PrintStream.java
similarity index 100%
rename from java/io/PrintStream.java
rename to classes/java/io/PrintStream.java
diff --git a/java/lang/Boolean.java b/classes/java/lang/Boolean.java
similarity index 100%
rename from java/lang/Boolean.java
rename to classes/java/lang/Boolean.java
diff --git a/java/lang/Byte.java b/classes/java/lang/Byte.java
similarity index 100%
rename from java/lang/Byte.java
rename to classes/java/lang/Byte.java
diff --git a/java/lang/Character.java b/classes/java/lang/Character.java
similarity index 100%
rename from java/lang/Character.java
rename to classes/java/lang/Character.java
diff --git a/java/lang/DecimalDigits.java b/classes/java/lang/DecimalDigits.java
similarity index 100%
rename from java/lang/DecimalDigits.java
rename to classes/java/lang/DecimalDigits.java
diff --git a/java/lang/Double.java b/classes/java/lang/Double.java
similarity index 100%
rename from java/lang/Double.java
rename to classes/java/lang/Double.java
diff --git a/java/lang/Exception.java b/classes/java/lang/Exception.java
similarity index 100%
rename from java/lang/Exception.java
rename to classes/java/lang/Exception.java
diff --git a/java/lang/Float.java b/classes/java/lang/Float.java
similarity index 100%
rename from java/lang/Float.java
rename to classes/java/lang/Float.java
diff --git a/java/lang/Integer.java b/classes/java/lang/Integer.java
similarity index 100%
rename from java/lang/Integer.java
rename to classes/java/lang/Integer.java
diff --git a/java/lang/Long.java b/classes/java/lang/Long.java
similarity index 100%
rename from java/lang/Long.java
rename to classes/java/lang/Long.java
diff --git a/java/lang/Math.java b/classes/java/lang/Math.java
similarity index 100%
rename from java/lang/Math.java
rename to classes/java/lang/Math.java
diff --git a/java/lang/Object.java b/classes/java/lang/Object.java
similarity index 100%
rename from java/lang/Object.java
rename to classes/java/lang/Object.java
diff --git a/java/lang/Short.java b/classes/java/lang/Short.java
similarity index 100%
rename from java/lang/Short.java
rename to classes/java/lang/Short.java
diff --git a/java/lang/String.java b/classes/java/lang/String.java
similarity index 100%
rename from java/lang/String.java
rename to classes/java/lang/String.java
diff --git a/java/lang/System.java b/classes/java/lang/System.java
similarity index 100%
rename from java/lang/System.java
rename to classes/java/lang/System.java
diff --git a/java/lang/Throwable.java b/classes/java/lang/Throwable.java
similarity index 100%
rename from java/lang/Throwable.java
rename to classes/java/lang/Throwable.java
diff --git a/java/misc/Memory.java b/classes/java/misc/Memory.java
similarity index 100%
rename from java/misc/Memory.java
rename to classes/java/misc/Memory.java
diff --git a/java/misc/Resource.java b/classes/java/misc/Resource.java
similarity index 100%
rename from java/misc/Resource.java
rename to classes/java/misc/Resource.java
diff --git a/java/nio/Buffer.java b/classes/java/nio/Buffer.java
similarity index 100%
rename from java/nio/Buffer.java
rename to classes/java/nio/Buffer.java
diff --git a/java/nio/ByteBuffer.java b/classes/java/nio/ByteBuffer.java
similarity index 100%
rename from java/nio/ByteBuffer.java
rename to classes/java/nio/ByteBuffer.java
diff --git a/java/nio/ByteOrder.java b/classes/java/nio/ByteOrder.java
similarity index 100%
rename from java/nio/ByteOrder.java
rename to classes/java/nio/ByteOrder.java
diff --git a/jvm/internal/Loader.java b/classes/jvm/internal/Loader.java
similarity index 100%
rename from jvm/internal/Loader.java
rename to classes/jvm/internal/Loader.java
diff --git a/model/CubeModel.java b/classes/model/CubeModel.java
similarity index 100%
rename from model/CubeModel.java
rename to classes/model/CubeModel.java
diff --git a/model/FacePTN.java b/classes/model/FacePTN.java
similarity index 100%
rename from model/FacePTN.java
rename to classes/model/FacePTN.java
diff --git a/model/ModelObject.java b/classes/model/ModelObject.java
similarity index 100%
rename from model/ModelObject.java
rename to classes/model/ModelObject.java
diff --git a/model/Vec2.java b/classes/model/Vec2.java
similarity index 100%
rename from model/Vec2.java
rename to classes/model/Vec2.java
diff --git a/model/Vec3.java b/classes/model/Vec3.java
similarity index 100%
rename from model/Vec3.java
rename to classes/model/Vec3.java
diff --git a/p/AdventOfCodeDay1.java b/classes/p/AdventOfCodeDay1.java
similarity index 100%
rename from p/AdventOfCodeDay1.java
rename to classes/p/AdventOfCodeDay1.java
diff --git a/p/AdventOfCodeDay1_String.java b/classes/p/AdventOfCodeDay1_String.java
similarity index 100%
rename from p/AdventOfCodeDay1_String.java
rename to classes/p/AdventOfCodeDay1_String.java
diff --git a/p/AdventOfCodeDay2.java b/classes/p/AdventOfCodeDay2.java
similarity index 100%
rename from p/AdventOfCodeDay2.java
rename to classes/p/AdventOfCodeDay2.java
diff --git a/p/ByteArray.java b/classes/p/ByteArray.java
similarity index 100%
rename from p/ByteArray.java
rename to classes/p/ByteArray.java
diff --git a/p/CheckCastTest.java b/classes/p/CheckCastTest.java
similarity index 100%
rename from p/CheckCastTest.java
rename to classes/p/CheckCastTest.java
diff --git a/p/Data.java b/classes/p/Data.java
similarity index 100%
rename from p/Data.java
rename to classes/p/Data.java
diff --git a/p/DataTest.java b/classes/p/DataTest.java
similarity index 100%
rename from p/DataTest.java
rename to classes/p/DataTest.java
diff --git a/p/Double.java b/classes/p/Double.java
similarity index 100%
rename from p/Double.java
rename to classes/p/Double.java
diff --git a/p/Fields.java b/classes/p/Fields.java
similarity index 100%
rename from p/Fields.java
rename to classes/p/Fields.java
diff --git a/p/Float.java b/classes/p/Float.java
similarity index 100%
rename from p/Float.java
rename to classes/p/Float.java
diff --git a/p/Generic.java b/classes/p/Generic.java
similarity index 100%
rename from p/Generic.java
rename to classes/p/Generic.java
diff --git a/p/InheritanceTest.java b/classes/p/InheritanceTest.java
similarity index 100%
rename from p/InheritanceTest.java
rename to classes/p/InheritanceTest.java
diff --git a/p/Instance.java b/classes/p/Instance.java
similarity index 100%
rename from p/Instance.java
rename to classes/p/Instance.java
diff --git a/p/InstanceFields.java b/classes/p/InstanceFields.java
similarity index 100%
rename from p/InstanceFields.java
rename to classes/p/InstanceFields.java
diff --git a/p/InstanceOf.java b/classes/p/InstanceOf.java
similarity index 100%
rename from p/InstanceOf.java
rename to classes/p/InstanceOf.java
diff --git a/p/InterfaceTest.java b/classes/p/InterfaceTest.java
similarity index 100%
rename from p/InterfaceTest.java
rename to classes/p/InterfaceTest.java
diff --git a/p/InvokeInterfaceTest.java b/classes/p/InvokeInterfaceTest.java
similarity index 100%
rename from p/InvokeInterfaceTest.java
rename to classes/p/InvokeInterfaceTest.java
diff --git a/p/Long.java b/classes/p/Long.java
similarity index 100%
rename from p/Long.java
rename to classes/p/Long.java
diff --git a/p/LongStaticField.java b/classes/p/LongStaticField.java
similarity index 100%
rename from p/LongStaticField.java
rename to classes/p/LongStaticField.java
diff --git a/p/LookupSwitch.java b/classes/p/LookupSwitch.java
similarity index 100%
rename from p/LookupSwitch.java
rename to classes/p/LookupSwitch.java
diff --git a/p/Main.java b/classes/p/Main.java
similarity index 100%
rename from p/Main.java
rename to classes/p/Main.java
diff --git a/p/MultiArray.java b/classes/p/MultiArray.java
similarity index 100%
rename from p/MultiArray.java
rename to classes/p/MultiArray.java
diff --git a/p/Multiply.java b/classes/p/Multiply.java
similarity index 100%
rename from p/Multiply.java
rename to classes/p/Multiply.java
diff --git a/p/Native.java b/classes/p/Native.java
similarity index 100%
rename from p/Native.java
rename to classes/p/Native.java
diff --git a/p/Nest.java b/classes/p/Nest.java
similarity index 100%
rename from p/Nest.java
rename to classes/p/Nest.java
diff --git a/p/Nested.java b/classes/p/Nested.java
similarity index 100%
rename from p/Nested.java
rename to classes/p/Nested.java
diff --git a/p/NullReference.java b/classes/p/NullReference.java
similarity index 100%
rename from p/NullReference.java
rename to classes/p/NullReference.java
diff --git a/p/Rem.java b/classes/p/Rem.java
similarity index 100%
rename from p/Rem.java
rename to classes/p/Rem.java
diff --git a/p/ShortArray.java b/classes/p/ShortArray.java
similarity index 100%
rename from p/ShortArray.java
rename to classes/p/ShortArray.java
diff --git a/p/SinCos.java b/classes/p/SinCos.java
similarity index 100%
rename from p/SinCos.java
rename to classes/p/SinCos.java
diff --git a/p/Solution.java b/classes/p/Solution.java
similarity index 100%
rename from p/Solution.java
rename to classes/p/Solution.java
diff --git a/p/StaticField.java b/classes/p/StaticField.java
similarity index 100%
rename from p/StaticField.java
rename to classes/p/StaticField.java
diff --git a/p/StaticMethodOverloading.java b/classes/p/StaticMethodOverloading.java
similarity index 100%
rename from p/StaticMethodOverloading.java
rename to classes/p/StaticMethodOverloading.java
diff --git a/p/Test2.java b/classes/p/Test2.java
similarity index 100%
rename from p/Test2.java
rename to classes/p/Test2.java
diff --git a/p/TestByteBuffer.java b/classes/p/TestByteBuffer.java
similarity index 100%
rename from p/TestByteBuffer.java
rename to classes/p/TestByteBuffer.java
diff --git a/p/TestByteOrder.java b/classes/p/TestByteOrder.java
similarity index 100%
rename from p/TestByteOrder.java
rename to classes/p/TestByteOrder.java
diff --git a/p/TestException.java b/classes/p/TestException.java
similarity index 100%
rename from p/TestException.java
rename to classes/p/TestException.java
diff --git a/p/TestFinally.java b/classes/p/TestFinally.java
similarity index 100%
rename from p/TestFinally.java
rename to classes/p/TestFinally.java
diff --git a/p/TestFloatPrint.java b/classes/p/TestFloatPrint.java
similarity index 100%
rename from p/TestFloatPrint.java
rename to classes/p/TestFloatPrint.java
diff --git a/p/TestInstanceof.java b/classes/p/TestInstanceof.java
similarity index 100%
rename from p/TestInstanceof.java
rename to classes/p/TestInstanceof.java
diff --git a/p/TestInvokeDynamic.java b/classes/p/TestInvokeDynamic.java
similarity index 100%
rename from p/TestInvokeDynamic.java
rename to classes/p/TestInvokeDynamic.java
diff --git a/p/TestLoader.java b/classes/p/TestLoader.java
similarity index 100%
rename from p/TestLoader.java
rename to classes/p/TestLoader.java
diff --git a/p/TestPrintLong.java b/classes/p/TestPrintLong.java
similarity index 100%
rename from p/TestPrintLong.java
rename to classes/p/TestPrintLong.java
diff --git a/p/TestResource.java b/classes/p/TestResource.java
similarity index 100%
rename from p/TestResource.java
rename to classes/p/TestResource.java
diff --git a/p/TestString.java b/classes/p/TestString.java
similarity index 100%
rename from p/TestString.java
rename to classes/p/TestString.java
diff --git a/p/VecTest.java b/classes/p/VecTest.java
similarity index 100%
rename from p/VecTest.java
rename to classes/p/VecTest.java
diff --git a/p/WideInstruction.java b/classes/p/WideInstruction.java
similarity index 100%
rename from p/WideInstruction.java
rename to classes/p/WideInstruction.java
diff --git a/sega/dreamcast/MemoryMap.java b/classes/sega/dreamcast/MemoryMap.java
similarity index 100%
rename from sega/dreamcast/MemoryMap.java
rename to classes/sega/dreamcast/MemoryMap.java
diff --git a/sega/dreamcast/g2_if/G2IF.java b/classes/sega/dreamcast/g2_if/G2IF.java
similarity index 100%
rename from sega/dreamcast/g2_if/G2IF.java
rename to classes/sega/dreamcast/g2_if/G2IF.java
diff --git a/sega/dreamcast/gdrom/G1IF.java b/classes/sega/dreamcast/gdrom/G1IF.java
similarity index 100%
rename from sega/dreamcast/gdrom/G1IF.java
rename to classes/sega/dreamcast/gdrom/G1IF.java
diff --git a/sega/dreamcast/gdrom/Gdrom.java b/classes/sega/dreamcast/gdrom/Gdrom.java
similarity index 100%
rename from sega/dreamcast/gdrom/Gdrom.java
rename to classes/sega/dreamcast/gdrom/Gdrom.java
diff --git a/sega/dreamcast/gdrom/GdromBits.java b/classes/sega/dreamcast/gdrom/GdromBits.java
similarity index 100%
rename from sega/dreamcast/gdrom/GdromBits.java
rename to classes/sega/dreamcast/gdrom/GdromBits.java
diff --git a/sega/dreamcast/gdrom/GdromCommandPacketFormat.java b/classes/sega/dreamcast/gdrom/GdromCommandPacketFormat.java
similarity index 100%
rename from sega/dreamcast/gdrom/GdromCommandPacketFormat.java
rename to classes/sega/dreamcast/gdrom/GdromCommandPacketFormat.java
diff --git a/sega/dreamcast/gdrom/GdromCommandPacketInterface.java b/classes/sega/dreamcast/gdrom/GdromCommandPacketInterface.java
similarity index 100%
rename from sega/dreamcast/gdrom/GdromCommandPacketInterface.java
rename to classes/sega/dreamcast/gdrom/GdromCommandPacketInterface.java
diff --git a/sega/dreamcast/gdrom/GdromExtentReader.java b/classes/sega/dreamcast/gdrom/GdromExtentReader.java
similarity index 100%
rename from sega/dreamcast/gdrom/GdromExtentReader.java
rename to classes/sega/dreamcast/gdrom/GdromExtentReader.java
diff --git a/sega/dreamcast/gdrom/GdromIF.java b/classes/sega/dreamcast/gdrom/GdromIF.java
similarity index 100%
rename from sega/dreamcast/gdrom/GdromIF.java
rename to classes/sega/dreamcast/gdrom/GdromIF.java
diff --git a/sega/dreamcast/gdrom/GdromProtocol.java b/classes/sega/dreamcast/gdrom/GdromProtocol.java
similarity index 100%
rename from sega/dreamcast/gdrom/GdromProtocol.java
rename to classes/sega/dreamcast/gdrom/GdromProtocol.java
diff --git a/sega/dreamcast/holly/Background.java b/classes/sega/dreamcast/holly/Background.java
similarity index 100%
rename from sega/dreamcast/holly/Background.java
rename to classes/sega/dreamcast/holly/Background.java
diff --git a/sega/dreamcast/holly/Core.java b/classes/sega/dreamcast/holly/Core.java
similarity index 100%
rename from sega/dreamcast/holly/Core.java
rename to classes/sega/dreamcast/holly/Core.java
diff --git a/sega/dreamcast/holly/CoreBits.java b/classes/sega/dreamcast/holly/CoreBits.java
similarity index 100%
rename from sega/dreamcast/holly/CoreBits.java
rename to classes/sega/dreamcast/holly/CoreBits.java
diff --git a/sega/dreamcast/holly/Holly.java b/classes/sega/dreamcast/holly/Holly.java
similarity index 100%
rename from sega/dreamcast/holly/Holly.java
rename to classes/sega/dreamcast/holly/Holly.java
diff --git a/sega/dreamcast/holly/ISPTSP.java b/classes/sega/dreamcast/holly/ISPTSP.java
similarity index 100%
rename from sega/dreamcast/holly/ISPTSP.java
rename to classes/sega/dreamcast/holly/ISPTSP.java
diff --git a/sega/dreamcast/holly/RegionArray.java b/classes/sega/dreamcast/holly/RegionArray.java
similarity index 100%
rename from sega/dreamcast/holly/RegionArray.java
rename to classes/sega/dreamcast/holly/RegionArray.java
diff --git a/sega/dreamcast/holly/TABits.java b/classes/sega/dreamcast/holly/TABits.java
similarity index 100%
rename from sega/dreamcast/holly/TABits.java
rename to classes/sega/dreamcast/holly/TABits.java
diff --git a/sega/dreamcast/holly/TAFIFOPolygonConverter.java b/classes/sega/dreamcast/holly/TAFIFOPolygonConverter.java
similarity index 100%
rename from sega/dreamcast/holly/TAFIFOPolygonConverter.java
rename to classes/sega/dreamcast/holly/TAFIFOPolygonConverter.java
diff --git a/sega/dreamcast/holly/TAGlobalParameter.java b/classes/sega/dreamcast/holly/TAGlobalParameter.java
similarity index 100%
rename from sega/dreamcast/holly/TAGlobalParameter.java
rename to classes/sega/dreamcast/holly/TAGlobalParameter.java
diff --git a/sega/dreamcast/holly/TAParameter.java b/classes/sega/dreamcast/holly/TAParameter.java
similarity index 100%
rename from sega/dreamcast/holly/TAParameter.java
rename to classes/sega/dreamcast/holly/TAParameter.java
diff --git a/sega/dreamcast/holly/TAVertexParameter.java b/classes/sega/dreamcast/holly/TAVertexParameter.java
similarity index 100%
rename from sega/dreamcast/holly/TAVertexParameter.java
rename to classes/sega/dreamcast/holly/TAVertexParameter.java
diff --git a/sega/dreamcast/holly/TextureMemoryAllocation.java b/classes/sega/dreamcast/holly/TextureMemoryAllocation.java
similarity index 100%
rename from sega/dreamcast/holly/TextureMemoryAllocation.java
rename to classes/sega/dreamcast/holly/TextureMemoryAllocation.java
diff --git a/sega/dreamcast/holly/VideoOutput.java b/classes/sega/dreamcast/holly/VideoOutput.java
similarity index 100%
rename from sega/dreamcast/holly/VideoOutput.java
rename to classes/sega/dreamcast/holly/VideoOutput.java
diff --git a/sega/dreamcast/holly/VideoOutputMode.java b/classes/sega/dreamcast/holly/VideoOutputMode.java
similarity index 100%
rename from sega/dreamcast/holly/VideoOutputMode.java
rename to classes/sega/dreamcast/holly/VideoOutputMode.java
diff --git a/sega/dreamcast/maple/MapleIF.java b/classes/sega/dreamcast/maple/MapleIF.java
similarity index 100%
rename from sega/dreamcast/maple/MapleIF.java
rename to classes/sega/dreamcast/maple/MapleIF.java
diff --git a/sega/dreamcast/pvr_if/PVRIF.java b/classes/sega/dreamcast/pvr_if/PVRIF.java
similarity index 100%
rename from sega/dreamcast/pvr_if/PVRIF.java
rename to classes/sega/dreamcast/pvr_if/PVRIF.java
diff --git a/sega/dreamcast/systembus/Systembus.java b/classes/sega/dreamcast/systembus/Systembus.java
similarity index 100%
rename from sega/dreamcast/systembus/Systembus.java
rename to classes/sega/dreamcast/systembus/Systembus.java
diff --git a/sega/dreamcast/systembus/SystembusBits.java b/classes/sega/dreamcast/systembus/SystembusBits.java
similarity index 100%
rename from sega/dreamcast/systembus/SystembusBits.java
rename to classes/sega/dreamcast/systembus/SystembusBits.java
diff --git a/test/TestMultiArray.java b/classes/test/TestMultiArray.java
similarity index 100%
rename from test/TestMultiArray.java
rename to classes/test/TestMultiArray.java
diff --git a/test/TestObjectArray.java b/classes/test/TestObjectArray.java
similarity index 100%
rename from test/TestObjectArray.java
rename to classes/test/TestObjectArray.java
diff --git a/test/TestPrimitiveArray.java b/classes/test/TestPrimitiveArray.java
similarity index 100%
rename from test/TestPrimitiveArray.java
rename to classes/test/TestPrimitiveArray.java