Renamed packages and reverted to older implementation