Renamed classes, moved packages around, makes more sense now I think
readded classes that got deleted