Moved more classes to RoboGuice [many things broken]