renamed the files, separated out the inheritance tree