feature relocation
Restructure