re-structure...