+most of the stuff is working
+ bunch of renames to bring the 2 version closer + at-least-not-crashing levels of Optifine support
major package refactoring