oj 2.0
Just a bit of reorganizing
Rake was missing. Wat?