deleted unused interfaces and classes, re-org existing classes