restructered single file into pakages