Refactored and renamed ingestion to storage