Adding packages, OCSF and general arrangment