moved stuff around
Merge pull request #11 from bazaarvoice/ofisk

moved stuff around