R1:534c0aa32693

Minor, move all storage/query/db code to src/infrastructure/storage