add rake, reshuffle dependencies