Changed package structure to reflect changes in dev, will try to merge
dev into this branch and see if we can keep peoples' changes from last
sprint