Refactor package paths.
Updated to work with "blaze-refactor" branch.