Restructure configure