Move package methods into class