stripped out unused classes, started refactoring for Mod