am 93e8a643: Changed class paths for classes moved in unbundling effort

Merge commit '93e8a643a87342839e49c17f9b8c98e5db7b691e'

* commit '93e8a643a87342839e49c17f9b8c98e5db7b691e':
  Changed class paths for classes moved in unbundling effort