Moved all J-data over into parallel classes.