Cross over to new v3 code - remove old packages and classes