Put new hammer interface in the correct package...