Restructure and change of base