diff --git a/fml/conf/packages.csv b/fml/conf/packages.csv
index 25cf3b8bf..937faabe7 100644
--- a/fml/conf/packages.csv
+++ b/fml/conf/packages.csv
@@ -1,44 +1,4 @@
 class,package
-BanEntry,net/minecraft
-BanList,net/minecraft
-ChatAllowedCharacters,net/minecraft
-ChunkCoordinates,net/minecraft
-ConsoleLogFormatter,net/minecraft
-ConsoleLogManager,net/minecraft
-ConvertingProgressUpdate,net/minecraft
-DerivedWorldInfo,net/minecraft
-EnumCreatureAttribute,net/minecraft
-EnumGameType,net/minecraft
-ExtendedBlockStorage,net/minecraft
-GameRuleValue,net/minecraft
-GameRules,net/minecraft
-HttpUtil,net/minecraft
-HttpUtilRunnable,net/minecraft
-IBossDisplayData,net/minecraft
-ILocatableSource,net/minecraft
-ILocation,net/minecraft
-IPlayerFileData,net/minecraft
-IPosition,net/minecraft
-IRegistry,net/minecraft
-IServer,net/minecraft
-LowerStringMap,net/minecraft
-NibbleArrayReader,net/minecraft
-NumberInvalidException,net/minecraft
-PlayerInstance,net/minecraft
-PlayerManager,net/minecraft
-PlayerNotFoundException,net/minecraft
-PlayerPositionComparator,net/minecraft
-PlayerSelector,net/minecraft
-PortalPosition,net/minecraft
-PositionImpl,net/minecraft
-PropertyManager,net/minecraft
-RandomPositionGenerator,net/minecraft
-RegistryDefaulted,net/minecraft
-RegistrySimple,net/minecraft
-ReportedException,net/minecraft
-ServerConfigurationManager,net/minecraft
-SyntaxErrorException,net/minecraft
-WrongUsageException,net/minecraft
 Block,net/minecraft/block
 BlockAnvil,net/minecraft/block
 BlockBeacon,net/minecraft/block
@@ -163,14 +123,7 @@ MaterialLogic,net/minecraft/block/material
 MaterialPortal,net/minecraft/block/material
 MaterialTransparent,net/minecraft/block/material
 MaterialWeb,net/minecraft/block/material
-AnvilChunkLoader,net/minecraft/chunk/storage
-AnvilChunkLoaderPending,net/minecraft/chunk/storage
-AnvilConverterData,net/minecraft/chunk/storage
-AnvilSaveConverter,net/minecraft/chunk/storage
-AnvilSaveConverterFileFilter,net/minecraft/chunk/storage
-AnvilSaveHandler,net/minecraft/chunk/storage
 ActiveRenderInfo,net/minecraft/client
-BossStatus,net/minecraft/client
 CallableClientMemoryStats,net/minecraft/client
 CallableClientProfiler,net/minecraft/client
 CallableGLInfo,net/minecraft/client
@@ -271,6 +224,7 @@ GuiMerchant,net/minecraft/client/gui
 GuiMultiplayer,net/minecraft/client/gui
 GuiNewChat,net/minecraft/client/gui
 GuiOptions,net/minecraft/client/gui
+GuiParticle,net/minecraft/client/gui
 GuiPlayerInfo,net/minecraft/client/gui
 GuiProgress,net/minecraft/client/gui
 GuiRenameWorld,net/minecraft/client/gui
@@ -296,6 +250,7 @@ GuiWinGame,net/minecraft/client/gui
 GuiWorldSlot,net/minecraft/client/gui
 GuiYesNo,net/minecraft/client/gui
 MapItemRenderer,net/minecraft/client/gui
+Particle,net/minecraft/client/gui
 ScaledResolution,net/minecraft/client/gui
 ThreadPollServers,net/minecraft/client/gui
 GuiAchievement,net/minecraft/client/gui/achievement
@@ -323,8 +278,6 @@ GuiEditSign,net/minecraft/client/gui/inventory
 GuiFurnace,net/minecraft/client/gui/inventory
 GuiInventory,net/minecraft/client/gui/inventory
 SlotCreativeInventory,net/minecraft/client/gui/inventory
-GuiParticle,net/minecraft/client/gui/particle
-Particle,net/minecraft/client/gui/particle
 ModelBase,net/minecraft/client/model
 ModelBat,net/minecraft/client/model
 ModelBiped,net/minecraft/client/model
@@ -545,13 +498,17 @@ CommandToggleDownfall,net/minecraft/command
 CommandWeather,net/minecraft/command
 CommandXP,net/minecraft/command
 IAdminCommand,net/minecraft/command
-IBlockSource,net/minecraft/command
 ICommand,net/minecraft/command
 ICommandManager,net/minecraft/command
 ICommandSender,net/minecraft/command
 IEntitySelector,net/minecraft/command
+NumberInvalidException,net/minecraft/command
+PlayerNotFoundException,net/minecraft/command
+PlayerSelector,net/minecraft/command
 ServerCommand,net/minecraft/command
 ServerCommandManager,net/minecraft/command
+SyntaxErrorException,net/minecraft/command
+WrongUsageException,net/minecraft/command
 CallableBlockDataValue,net/minecraft/crash
 CallableBlockLocation,net/minecraft/crash
 CallableBlockType,net/minecraft/crash
@@ -597,6 +554,14 @@ BehaviorPotionDispenseLogic,net/minecraft/dispenser
 BehaviorProjectileDispense,net/minecraft/dispenser
 BehaviorSnowballDispense,net/minecraft/dispenser
 IBehaviorDispenseItem,net/minecraft/dispenser
+IBlockSource,net/minecraft/dispenser
+ILocatableSource,net/minecraft/dispenser
+ILocation,net/minecraft/dispenser
+IPosition,net/minecraft/dispenser
+IRegistry,net/minecraft/dispenser
+PositionImpl,net/minecraft/dispenser
+RegistryDefaulted,net/minecraft/dispenser
+RegistrySimple,net/minecraft/dispenser
 Empty3,net/minecraft/enchantment
 Enchantment,net/minecraft/enchantment
 EnchantmentArrowDamage,net/minecraft/enchantment
@@ -637,6 +602,7 @@ EntityVillager,net/minecraft/entity
 EntityWitch,net/minecraft/entity
 EntityXPOrb,net/minecraft/entity
 EnumArt,net/minecraft/entity
+EnumCreatureAttribute,net/minecraft/entity
 EnumCreatureType,net/minecraft/entity
 EnumEntitySize,net/minecraft/entity
 EnumEntitySizeHelper,net/minecraft/entity
@@ -697,6 +663,7 @@ EntityJumpHelper,net/minecraft/entity/ai
 EntityLookHelper,net/minecraft/entity/ai
 EntityMoveHelper,net/minecraft/entity/ai
 EntitySenses,net/minecraft/entity/ai
+RandomPositionGenerator,net/minecraft/entity/ai
 ContainerSheep,net/minecraft/entity/animal
 EntityAmbientCreature,net/minecraft/entity/animal
 EntityAnimal,net/minecraft/entity/animal
@@ -712,6 +679,12 @@ EntityTameable,net/minecraft/entity/animal
 EntityWaterMob,net/minecraft/entity/animal
 EntityWolf,net/minecraft/entity/animal
 IAnimals,net/minecraft/entity/animal
+BossStatus,net/minecraft/entity/boss
+EntityDragon,net/minecraft/entity/boss
+EntityDragonPart,net/minecraft/entity/boss
+EntityWither,net/minecraft/entity/boss
+EntityWitherAttackFilter,net/minecraft/entity/boss
+IBossDisplayData,net/minecraft/entity/boss
 EntityLightningBolt,net/minecraft/entity/effect
 EntityWeatherEffect,net/minecraft/entity/effect
 EntityBoat,net/minecraft/entity/item
@@ -727,8 +700,6 @@ EntityTNTPrimed,net/minecraft/entity/item
 EntityBlaze,net/minecraft/entity/monster
 EntityCaveSpider,net/minecraft/entity/monster
 EntityCreeper,net/minecraft/entity/monster
-EntityDragon,net/minecraft/entity/monster
-EntityDragonPart,net/minecraft/entity/monster
 EntityEnderman,net/minecraft/entity/monster
 EntityGhast,net/minecraft/entity/monster
 EntityGiantZombie,net/minecraft/entity/monster
@@ -742,8 +713,6 @@ EntitySkeleton,net/minecraft/entity/monster
 EntitySlime,net/minecraft/entity/monster
 EntitySnowman,net/minecraft/entity/monster
 EntitySpider,net/minecraft/entity/monster
-EntityWither,net/minecraft/entity/monster
-EntityWitherAttackFilter,net/minecraft/entity/monster
 EntityZombie,net/minecraft/entity/monster
 FilterIMob,net/minecraft/entity/monster
 IMob,net/minecraft/entity/monster
@@ -979,6 +948,7 @@ Packet7UseEntity,net/minecraft/network/packet
 Packet8UpdateHealth,net/minecraft/network/packet
 Packet9Respawn,net/minecraft/network/packet
 PacketCount,net/minecraft/network/packet
+IServer,net/minecraft/network/rcon
 RConConsoleSource,net/minecraft/network/rcon
 RConOutputStream,net/minecraft/network/rcon
 RConThreadBase,net/minecraft/network/rcon
@@ -1004,16 +974,20 @@ ProfilerResult,net/minecraft/profiler
 CallableIsServerModded,net/minecraft/server
 CallableServerMemoryStats,net/minecraft/server
 CallableServerProfiler,net/minecraft/server
+ConvertingProgressUpdate,net/minecraft/server
 ServerListenThread,net/minecraft/server
 ThreadDedicatedServer,net/minecraft/server
 ThreadMinecraftServer,net/minecraft/server
 CallableServerType,net/minecraft/server/dedicated
 CallableType,net/minecraft/server/dedicated
+ConsoleLogFormatter,net/minecraft/server/dedicated
+ConsoleLogManager,net/minecraft/server/dedicated
 DedicatedPlayerList,net/minecraft/server/dedicated
 DedicatedServer,net/minecraft/server/dedicated
 DedicatedServerCommandThread,net/minecraft/server/dedicated
 DedicatedServerListenThread,net/minecraft/server/dedicated
 DedicatedServerSleepThread,net/minecraft/server/dedicated
+PropertyManager,net/minecraft/server/dedicated
 GuiLogFormatter,net/minecraft/server/gui
 GuiLogOutputHandler,net/minecraft/server/gui
 GuiStatsComponent,net/minecraft/server/gui
@@ -1024,6 +998,13 @@ ServerGUI,net/minecraft/server/gui
 ServerGuiCommandListener,net/minecraft/server/gui
 ServerGuiFocusAdapter,net/minecraft/server/gui
 ServerWindowAdapter,net/minecraft/server/gui
+BanEntry,net/minecraft/server/management
+BanList,net/minecraft/server/management
+LowerStringMap,net/minecraft/server/management
+PlayerInstance,net/minecraft/server/management
+PlayerManager,net/minecraft/server/management
+PlayerPositionComparator,net/minecraft/server/management
+ServerConfigurationManager,net/minecraft/server/management
 Achievement,net/minecraft/stats
 AchievementList,net/minecraft/stats
 AchievementMap,net/minecraft/stats
@@ -1059,6 +1040,8 @@ TileEntitySkull,net/minecraft/tileentity
 AABBLocalPool,net/minecraft/util
 AABBPool,net/minecraft/util
 AxisAlignedBB,net/minecraft/util
+ChatAllowedCharacters,net/minecraft/util
+ChunkCoordinates,net/minecraft/util
 CryptManager,net/minecraft/util
 DamageSource,net/minecraft/util
 Direction,net/minecraft/util
@@ -1068,6 +1051,8 @@ EnumFacing,net/minecraft/util
 EnumMovingObjectType,net/minecraft/util
 Facing,net/minecraft/util
 FoodStats,net/minecraft/util
+HttpUtil,net/minecraft/util
+HttpUtilRunnable,net/minecraft/util
 IProgressUpdate,net/minecraft/util
 IntHashMap,net/minecraft/util
 IntHashMapEntry,net/minecraft/util
@@ -1077,6 +1062,7 @@ MD5String,net/minecraft/util
 MathHelper,net/minecraft/util
 MouseFilter,net/minecraft/util
 MovingObjectPosition,net/minecraft/util
+ReportedException,net/minecraft/util
 StatCollector,net/minecraft/util
 StringTranslate,net/minecraft/util
 StringUtils,net/minecraft/util
@@ -1102,12 +1088,16 @@ ChunkPosition,net/minecraft/world
 ColorizerFoliage,net/minecraft/world
 ColorizerGrass,net/minecraft/world
 ColorizerWater,net/minecraft/world
+EnumGameType,net/minecraft/world
 EnumSkyBlock,net/minecraft/world
 Explosion,net/minecraft/world
+GameRuleValue,net/minecraft/world
+GameRules,net/minecraft/world
 IBlockAccess,net/minecraft/world
 IWorldAccess,net/minecraft/world
 MinecraftException,net/minecraft/world
 NextTickListEntry,net/minecraft/world
+PortalPosition,net/minecraft/world
 ServerBlockEvent,net/minecraft/world
 ServerBlockEventList,net/minecraft/world
 SpawnerAnimals,net/minecraft/world
@@ -1149,8 +1139,16 @@ Chunk,net/minecraft/world/chunk
 EmptyChunk,net/minecraft/world/chunk
 IChunkProvider,net/minecraft/world/chunk
 NibbleArray,net/minecraft/world/chunk
+AnvilChunkLoader,net/minecraft/world/chunk/storage
+AnvilChunkLoaderPending,net/minecraft/world/chunk/storage
+AnvilConverterData,net/minecraft/world/chunk/storage
+AnvilSaveConverter,net/minecraft/world/chunk/storage
+AnvilSaveConverterFileFilter,net/minecraft/world/chunk/storage
+AnvilSaveHandler,net/minecraft/world/chunk/storage
 ChunkLoader,net/minecraft/world/chunk/storage
+ExtendedBlockStorage,net/minecraft/world/chunk/storage
 IChunkLoader,net/minecraft/world/chunk/storage
+NibbleArrayReader,net/minecraft/world/chunk/storage
 RegionFile,net/minecraft/world/chunk/storage
 RegionFileCache,net/minecraft/world/chunk/storage
 RegionFileChunkBuffer,net/minecraft/world/chunk/storage
@@ -1312,6 +1310,8 @@ CallableLevelSpawnLocation,net/minecraft/world/storage
 CallableLevelStorageVersion,net/minecraft/world/storage
 CallableLevelTime,net/minecraft/world/storage
 CallableLevelWeather,net/minecraft/world/storage
+DerivedWorldInfo,net/minecraft/world/storage
+IPlayerFileData,net/minecraft/world/storage
 ISaveFormat,net/minecraft/world/storage
 ISaveHandler,net/minecraft/world/storage
 IThreadedFileIO,net/minecraft/world/storage