Add remove and restructure code