Moved storage backends out of storage/backend and into storage