Change package name, use modern TH