pkg: move everything into subpackages

Following up #1424