Fix package folder structure.