Move to own package