Starting to refactor storage location