pkg: move everything into subpackages