Merge change Id2be5eb7

* changes:
  Eclipse doesn't like that this class' directory didn't match its package.