Updated props for ease of user user and moved JobData into entities

package for easy naming.

USERGRID-753