restructure: update images