Restructure internal components and add retraction support.