make thor its own package