Major code cleanup, included RoboGuice