split packages back out into separate files