Move (commented out) packages version class instance to ancestor

Change-Id: I10e0d253832153eab4e3076552fe6b922dc10c47