Refactor fruits

https://issues.griddynamics.net/browse/EG-53