Core structure redesign
More structure changes