Upgrade framework finished. Split resources into separate classes.