Re-organize the structure to be compatible with homesick