Package structure changes, preparations for apply function fo StockFactSheet