change the structure, remove inheritance