- canonical layout reorg and fix image links;