reorganize imports and add plots