Restructuring base/core