Extract version from updates
Reorganize classes