+ lots more cleanup + Optifine x-ray fix
reorganize packages to match Fabric version use util classes from Fabric version