Done Extraction. Restruct các package