Moved generated classes to a pojo package
merged from server
Updated to accomodate package change