Merge "Implement FilePackage class"