Refactor package names to correspond to module names

Resolves https://www.pivotaltracker.com/story/show/54934784