Rearrehed files into packages