Restructure source