Arranging files in proper packages