Glue/unglue restructuring