Classes renamed, SesameInfrastructure introduced