Adapt pkg files to the new flat directory structure