Refactor Content object usage #1455

Remove the use of Content object in favor of passing object directly.
Correct Java license boilerplate