Saner folder naming, and removed deprecation.