Split into two different packages