Fix packaging with new directory layout