Renamed the package sql to storage (allowing a different storage option
in the future)
Fixed imports after refactoring