Initial structure added w/ service hierarchy and inheritence