You need to keep the getCountrycode, getLatitude and getLongitude methods, otherwise the UI will break.  You can just have these delegate to the contained country and location objects.