Fix package folder flattening