Restructure extension