added storable\api; fixed NS & package declarations