Updated structure to be more like D8