Flattens out the /lib file organization, sets the stage separate span and segment avatar classes.