Surrogates and forSubclass headers files moved into correct places, unused files deleted