move images to asset catalog
restructure class groups