Reshuffle namespaces

osu.Desktop.VisualTests/Tests/TestCaseBeatmapDetails.cs

@@ -3,9 +3,9 @@
 
 using osu.Framework.Graphics;
 using osu.Framework.Testing;
-using osu.Game.Database;
 using osu.Game.Screens.Select;
 using System.Linq;
+using osu.Game.Beatmaps;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Desktop.VisualTests/Tests/TestCaseDirect.cs

@@ -4,8 +4,9 @@
 using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Overlays;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Desktop.VisualTests/Tests/TestCaseDrawableRoom.cs

@@ -7,8 +7,9 @@ using osu.Framework.Testing;
 using osu.Game.Screens.Multiplayer;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
-using osu.Game.Database;
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Desktop.VisualTests/Tests/TestCaseGamefield.cs

@@ -8,7 +8,6 @@ using osu.Framework.MathUtils;
 using osu.Framework.Testing;
 using osu.Framework.Timing;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Catch.UI;
 using osu.Game.Rulesets.Mania.UI;
 using osu.Game.Rulesets.Objects;
@@ -19,6 +18,7 @@ using System.Collections.Generic;
 using osu.Desktop.VisualTests.Beatmaps;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps.ControlPoints;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Desktop.VisualTests/Tests/TestCaseMods.cs

@@ -5,7 +5,7 @@ using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Game.Overlays.Mods;
 using osu.Framework.Testing;
-using osu.Game.Database;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Play.HUD;
 using OpenTK;
 

osu.Desktop.VisualTests/Tests/TestCasePlaySongSelect.cs

@@ -13,7 +13,7 @@ namespace osu.Desktop.VisualTests.Tests
 {
     internal class TestCasePlaySongSelect : TestCase
     {
-        private readonly BeatmapDatabase db;
+        private readonly BeatmapStore db;
 
         public override string Description => @"with fake data";
 
@@ -30,7 +30,7 @@ namespace osu.Desktop.VisualTests.Tests
                 var backingDatabase = storage.GetDatabase(@"client");
 
                 rulesets = new RulesetDatabase(storage, backingDatabase);
-                db = new BeatmapDatabase(storage, backingDatabase, rulesets);
+                db = new BeatmapStore(storage, backingDatabase, rulesets);
 
                 var sets = new List<BeatmapSetInfo>();
 

osu.Desktop.VisualTests/Tests/TestCasePlayer.cs

@@ -6,7 +6,6 @@ using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
 using OpenTK;
-using osu.Game.Database;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Osu.Objects;
 using osu.Game.Screens.Play;
@@ -14,6 +13,7 @@ using OpenTK.Graphics;
 using osu.Desktop.VisualTests.Beatmaps;
 using osu.Game.Rulesets.Osu.UI;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Desktop.VisualTests/Tests/TestCaseResults.cs

@@ -7,7 +7,6 @@ using System.Linq;
 using osu.Framework.Allocation;
 using osu.Framework.Testing;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Screens.Ranking;
 using osu.Game.Users;

osu.Desktop.VisualTests/Tests/TestCaseRoomInspector.cs

@@ -4,10 +4,11 @@
 using osu.Framework.Testing;
 using osu.Framework.Graphics;
 using osu.Game.Screens.Multiplayer;
-using osu.Game.Database;
 using osu.Game.Online.Multiplayer;
 using osu.Game.Users;
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 
 namespace osu.Desktop.VisualTests.Tests
 {

osu.Game.Rulesets.Mania/Beatmaps/ManiaBeatmapConverter.cs

@@ -10,7 +10,6 @@ using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Objects.Types;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns;
 using osu.Game.Rulesets.Mania.MathUtils;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mania.Beatmaps.Patterns.Legacy;
 using OpenTK;
 using osu.Game.Audio;

osu.Game.Rulesets.Mania/Beatmaps/Patterns/Legacy/PatternGenerator.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mania.MathUtils;
 using osu.Game.Rulesets.Objects;
 using OpenTK;

osu.Game.Rulesets.Mania/Judgements/HitWindows.cs

@@ -1,7 +1,7 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Rulesets.Mania.Judgements
 {

osu.Game.Rulesets.Mania/Objects/HoldNote.cs

@@ -2,8 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using System.Collections.Generic;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Database;
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Mania.Objects

osu.Game.Rulesets.Mania/Objects/Note.cs

@@ -1,8 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mania.Judgements;
 
 namespace osu.Game.Rulesets.Mania.Objects

osu.Game.Rulesets.Mania/Scoring/ManiaScoreProcessor.cs

@@ -4,7 +4,6 @@
 using System;
 using System.Linq;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mania.Judgements;
 using osu.Game.Rulesets.Mania.Objects;
 using osu.Game.Rulesets.Objects.Drawables;

osu.Game.Rulesets.Osu/Objects/OsuHitObject.cs

@@ -1,12 +1,12 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects;
 using OpenTK;
 using osu.Game.Rulesets.Osu.Objects.Drawables;
 using osu.Game.Rulesets.Objects.Types;
 using OpenTK.Graphics;
-using osu.Game.Database;
 using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Osu.Objects

osu.Game.Rulesets.Osu/Objects/Slider.cs

@@ -6,9 +6,9 @@ using osu.Game.Rulesets.Objects.Types;
 using System;
 using System.Collections.Generic;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Database;
 using System.Linq;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Osu.Objects

osu.Game.Rulesets.Osu/Objects/Spinner.cs

@@ -1,8 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Objects.Types;
-using osu.Game.Database;
 using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Osu.Objects

osu.Game.Rulesets.Taiko/Beatmaps/TaikoBeatmapConverter.cs

@@ -8,7 +8,6 @@ using osu.Game.Rulesets.Taiko.Objects;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Database;
 using osu.Game.IO.Serialization;
 using osu.Game.Audio;
 using osu.Game.Rulesets.Beatmaps;

osu.Game.Rulesets.Taiko/Objects/DrumRoll.cs

@@ -5,8 +5,8 @@ using osu.Game.Rulesets.Objects.Types;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Database;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
 
 namespace osu.Game.Rulesets.Taiko.Objects

osu.Game.Rulesets.Taiko/Objects/Hit.cs

@@ -1,8 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Database;
 
 namespace osu.Game.Rulesets.Taiko.Objects
 {

osu.Game.Rulesets.Taiko/Objects/TaikoHitObject.cs

@@ -1,8 +1,8 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Database;
 using osu.Game.Rulesets.Objects;
 using osu.Game.Rulesets.Taiko.UI;
 

osu.Game.Rulesets.Taiko/Scoring/TaikoScoreProcessor.cs

@@ -3,7 +3,6 @@
 
 using System;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Rulesets.Objects.Drawables;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Rulesets.Taiko.Judgements;

osu.Game.Tests/Beatmaps/IO/ImportBeatmapTest.cs

@@ -10,9 +10,10 @@ using System.Threading.Tasks;
 using NUnit.Framework;
 using osu.Framework.Desktop.Platform;
 using osu.Framework.Platform;
-using osu.Game.Database;
 using osu.Game.IPC;
 using osu.Framework.Allocation;
+using osu.Game.Beatmaps;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Tests.Beatmaps.IO
 {

osu.Game.Tests/Beatmaps/IO/OszArchiveReaderTest.cs

@@ -3,10 +3,10 @@
 
 using System.IO;
 using NUnit.Framework;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.IO;
 using osu.Game.Tests.Resources;
 using osu.Game.Beatmaps.Formats;
-using osu.Game.Database;
 
 namespace osu.Game.Tests.Beatmaps.IO
 {

osu.Game/Beatmaps/Beatmap.cs

@@ -3,7 +3,6 @@
 
 using OpenTK.Graphics;
 using osu.Game.Beatmaps.Timing;
-using osu.Game.Database;
 using osu.Game.Rulesets.Objects;
 using System.Collections.Generic;
 using System.Linq;

osu.Game/Beatmaps/BeatmapDatabase.cs

@@ -18,7 +18,7 @@ using SQLiteNetExtensions.Extensions;
 
 namespace osu.Game.Database
 {
-    public class BeatmapDatabase : Database
+    public class BeatmapStore : DatabaseBacking
     {
         private readonly RulesetDatabase rulesets;
 
@@ -33,7 +33,7 @@ namespace osu.Game.Database
         /// </summary>
         public WorkingBeatmap DefaultBeatmap { private get; set; }
 
-        public BeatmapDatabase(Storage storage, SQLiteConnection connection, RulesetDatabase rulesets, IIpcHost importHost = null) : base(storage, connection)
+        public BeatmapStore(Storage storage, SQLiteConnection connection, RulesetDatabase rulesets, IIpcHost importHost = null) : base(storage, connection)
         {
             this.rulesets = rulesets;
             if (importHost != null)
@@ -291,7 +291,7 @@ namespace osu.Game.Database
             if (beatmapInfo.Metadata == null)
                 beatmapInfo.Metadata = beatmapInfo.BeatmapSet.Metadata;
 
-            WorkingBeatmap working = new DatabaseWorkingBeatmap(this, beatmapInfo);
+            WorkingBeatmap working = new BeatmapStoreWorkingBeatmap(this, beatmapInfo);
 
             previous?.TransferTo(working);
 

osu.Game/Beatmaps/BeatmapDatabaseWorkingBeatmap.cs

@@ -10,17 +10,17 @@ using osu.Game.Beatmaps.IO;
 
 namespace osu.Game.Database
 {
-    internal class DatabaseWorkingBeatmap : WorkingBeatmap
+    internal class BeatmapDatabaseWorkingBeatmap : WorkingBeatmap
     {
-        private readonly BeatmapDatabase database;
+        private readonly BeatmapStore store;
 
-        public DatabaseWorkingBeatmap(BeatmapDatabase database, BeatmapInfo beatmapInfo)
+        public BeatmapDatabaseWorkingBeatmap(BeatmapStore store, BeatmapInfo beatmapInfo)
             : base(beatmapInfo)
         {
-            this.database = database;
+            this.store = store;
         }
 
-        private ArchiveReader getReader() => database?.GetReader(BeatmapSetInfo);
+        private ArchiveReader getReader() => store?.GetReader(BeatmapSetInfo);
 
         protected override Beatmap GetBeatmap()
         {

osu.Game/Beatmaps/BeatmapDifficulty.cs

@@ -3,7 +3,7 @@
 
 using SQLite.Net.Attributes;
 
-namespace osu.Game.Database
+namespace osu.Game.Beatmaps
 {
     public class BeatmapDifficulty
     {

osu.Game/Beatmaps/BeatmapInfo.cs

@@ -1,14 +1,15 @@
 // Copyright (c) 2007-2017 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
-using Newtonsoft.Json;
-using osu.Game.IO.Serialization;
-using SQLite.Net.Attributes;
-using SQLiteNetExtensions.Attributes;
 using System;
 using System.Linq;
+using Newtonsoft.Json;
+using osu.Game.IO.Serialization;
+using osu.Game.Rulesets;
+using SQLite.Net.Attributes;
+using SQLiteNetExtensions.Attributes;
 
-namespace osu.Game.Database
+namespace osu.Game.Beatmaps
 {
     public class BeatmapInfo : IEquatable<BeatmapInfo>, IJsonSerializable
     {

osu.Game/Beatmaps/BeatmapMetadata.cs

@@ -5,7 +5,7 @@ using System.Linq;
 using Newtonsoft.Json;
 using SQLite.Net.Attributes;
 
-namespace osu.Game.Database
+namespace osu.Game.Beatmaps
 {
     public class BeatmapMetadata
     {

osu.Game/Beatmaps/BeatmapMetrics.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 
-namespace osu.Game.Database
+namespace osu.Game.Beatmaps
 {
     /// <summary>
     /// Beatmap metrics based on acculumated online data from community plays.

osu.Game/Beatmaps/BeatmapOnlineInfo.cs

@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace osu.Game.Database
+namespace osu.Game.Beatmaps
 {
     /// <summary>
     /// Beatmap info retrieved for previewing locally without having the beatmap downloaded.

osu.Game/Beatmaps/BeatmapSetInfo.cs

@@ -6,7 +6,7 @@ using System.Linq;
 using SQLite.Net.Attributes;
 using SQLiteNetExtensions.Attributes;
 
-namespace osu.Game.Database
+namespace osu.Game.Beatmaps
 {
     public class BeatmapSetInfo
     {

osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs

@@ -3,7 +3,7 @@
 
 using Newtonsoft.Json;
 
-namespace osu.Game.Database
+namespace osu.Game.Beatmaps
 {
     /// <summary>
     /// Beatmap set info retrieved for previewing locally without having the set downloaded.

osu.Game/Beatmaps/Drawables/BeatmapPanel.cs

@@ -6,7 +6,6 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Colour;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Backgrounds;
 using osu.Game.Graphics.UserInterface;

osu.Game/Beatmaps/Drawables/BeatmapSetCover.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Database;
 
 namespace osu.Game.Beatmaps.Drawables
 {

osu.Game/Beatmaps/Drawables/DifficultyColouredContainer.cs

@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using OpenTK.Graphics;
 

osu.Game/Beatmaps/Drawables/DifficultyIcon.cs

@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;

osu.Game/Beatmaps/DummyWorkingBeatmap.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using osu.Framework.Audio.Track;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Database;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Rulesets.Objects;

osu.Game/Beatmaps/Formats/BeatmapDecoder.cs

@@ -5,7 +5,6 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using osu.Game.Rulesets.Objects;
-using osu.Game.Database;
 
 namespace osu.Game.Beatmaps.Formats
 {

osu.Game/Beatmaps/RankStatus.cs

@@ -3,7 +3,7 @@
 
 using System.ComponentModel;
 
-namespace osu.Game.Database
+namespace osu.Game.Beatmaps
 {
     public enum RankStatus
     {

osu.Game/Beatmaps/WorkingBeatmap.cs

@@ -4,7 +4,6 @@
 using osu.Framework.Audio.Track;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics.Textures;
-using osu.Game.Database;
 using osu.Game.Rulesets.Mods;
 using System;
 using System.Collections.Generic;

osu.Game/Database/DatabaseBacking.cs

@@ -12,12 +12,12 @@ using SQLiteNetExtensions.Extensions;
 
 namespace osu.Game.Database
 {
-    public abstract class Database
+    public abstract class DatabaseBacking
     {
         protected SQLiteConnection Connection { get; }
         protected Storage Storage { get; }
 
-        protected Database(Storage storage, SQLiteConnection connection)
+        protected DatabaseBacking(Storage storage, SQLiteConnection connection)
         {
             Storage = storage;
             Connection = connection;

osu.Game/Graphics/Cursor/GameplayCursor.cs

@@ -13,7 +13,6 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
-using osu.Game.Database;
 
 namespace osu.Game.Graphics.Cursor
 {

osu.Game/IPC/BeatmapIPCChannel.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 using osu.Framework.Platform;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.IPC
 {

osu.Game/IPC/ScoreIPCChannel.cs

@@ -4,7 +4,7 @@
 using System.Diagnostics;
 using System.Threading.Tasks;
 using osu.Framework.Platform;
-using osu.Game.Database;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.IPC
 {

osu.Game/Online/API/Requests/GetBeatmapDetailsRequest.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using Newtonsoft.Json;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Online.API.Requests
 {

osu.Game/Online/API/Requests/GetBeatmapSetsRequest.cs

@@ -4,9 +4,10 @@
 using System.Collections.Generic;
 using System.Linq;
 using Newtonsoft.Json;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Overlays;
 using osu.Game.Overlays.Direct;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Online.API.Requests
 {

osu.Game/Online/API/Requests/GetScoresRequest.cs

@@ -4,7 +4,7 @@
 using System.Collections.Generic;
 using Newtonsoft.Json;
 using osu.Framework.IO.Network;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game.Online.API.Requests

osu.Game/Online/Multiplayer/Room.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Configuration;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Users;
 
 namespace osu.Game.Online.Multiplayer

osu.Game/OsuGame.cs

@@ -21,10 +21,10 @@ using OpenTK;
 using System.Linq;
 using System.Threading.Tasks;
 using osu.Framework.Threading;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Rulesets.Scoring;
 using osu.Game.Overlays.Notifications;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Play;
 
 namespace osu.Game

osu.Game/OsuGameBase.cs

@@ -13,13 +13,14 @@ using osu.Framework.Platform;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.IO;
 using osu.Game.Configuration;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
 using osu.Game.Graphics.Processing;
 using osu.Game.Online.API;
 using SQLite.Net;
 using osu.Framework.Graphics.Performance;
+using osu.Game.Rulesets;
+using osu.Game.Rulesets.Scoring;
 
 namespace osu.Game
 {

osu.Game/Overlays/Direct/DirectGridPanel.cs

@@ -8,10 +8,10 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Localisation;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Overlays.Direct
 {

osu.Game/Overlays/Direct/DirectListPanel.cs

@@ -9,11 +9,11 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Colour;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
-using osu.Game.Database;
 using osu.Framework.Allocation;
 using osu.Framework.Localisation;
 using osu.Framework.Input;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Direct

osu.Game/Overlays/Direct/DirectPanel.cs

@@ -6,8 +6,8 @@ using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 

osu.Game/Overlays/Direct/FilterControl.cs

@@ -7,10 +7,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays.SearchableList;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.Direct
 {

osu.Game/Overlays/DirectOverlay.cs

@@ -9,13 +9,14 @@ using osu.Framework.Configuration;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Threading;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Game.Overlays.Direct;
 using osu.Game.Overlays.SearchableList;
+using osu.Game.Rulesets;
 using OpenTK.Graphics;
 
 namespace osu.Game.Overlays

osu.Game/Overlays/Mods/ModSelectOverlay.cs

@@ -15,8 +15,8 @@ using osu.Game.Rulesets.Mods;
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using osu.Game.Database;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.Mods
 {

osu.Game/Overlays/Music/PlaylistItem.cs

@@ -9,7 +9,7 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Localisation;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 

osu.Game/Overlays/Music/PlaylistList.cs

@@ -6,7 +6,7 @@ using System.Collections.Generic;
 using System.Linq;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Overlays.Music

osu.Game/Overlays/Music/PlaylistOverlay.cs

@@ -9,7 +9,6 @@ using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using OpenTK;
 using OpenTK.Graphics;

osu.Game/Overlays/MusicController.cs

@@ -18,7 +18,6 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Framework.Threading;

osu.Game/Overlays/Settings/Sections/GameplaySection.cs

@@ -3,7 +3,6 @@
 
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Settings.Sections.Gameplay;
 using osu.Game.Rulesets;

osu.Game/Overlays/Settings/SettingsFooter.cs

@@ -5,9 +5,9 @@ using System.Collections.Generic;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
+using osu.Game.Rulesets;
 using OpenTK;
 using OpenTK.Graphics;
 

osu.Game/Overlays/Toolbar/ToolbarModeButton.cs

@@ -2,7 +2,7 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Framework.Graphics.Containers;
-using osu.Game.Database;
+using osu.Game.Rulesets;
 using OpenTK.Graphics;
 
 namespace osu.Game.Overlays.Toolbar

osu.Game/Overlays/Toolbar/ToolbarModeSelector.cs

@@ -6,11 +6,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Caching;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Database;
 using OpenTK;
 using OpenTK.Graphics;
 using osu.Framework.Configuration;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Overlays.Toolbar
 {

osu.Game/Rulesets/Objects/HitObject.cs

@@ -2,8 +2,8 @@
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Database;
 using osu.Game.Rulesets.Objects.Types;
 
 namespace osu.Game.Rulesets.Objects

osu.Game/Rulesets/Objects/Legacy/ConvertSlider.cs

@@ -6,8 +6,8 @@ using System;
 using System.Collections.Generic;
 using OpenTK;
 using osu.Game.Audio;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.ControlPoints;
-using osu.Game.Database;
 
 namespace osu.Game.Rulesets.Objects.Legacy
 {

osu.Game/Rulesets/Scoring/Score.cs

@@ -4,7 +4,7 @@
 using System;
 using System.Collections.Generic;
 using Newtonsoft.Json;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Rulesets.Mods;
 using osu.Game.Users;
 using osu.Game.Rulesets.Replays;

osu.Game/Rulesets/Scoring/ScoreDatabase.cs

@@ -15,11 +15,11 @@ using SQLite.Net;
 
 namespace osu.Game.Database
 {
-    public class ScoreDatabase : Database
+    public class ScoreDatabase : DatabaseBacking
     {
         private readonly Storage storage;
 
-        private readonly BeatmapDatabase beatmaps;
+        private readonly BeatmapStore beatmaps;
         private readonly RulesetDatabase rulesets;
 
         private const string replay_folder = @"replays";
@@ -27,7 +27,7 @@ namespace osu.Game.Database
         // ReSharper disable once NotAccessedField.Local (we should keep a reference to this so it is not finalised)
         private ScoreIPCChannel ipc;
 
-        public ScoreDatabase(Storage storage, SQLiteConnection connection, IIpcHost importHost = null, BeatmapDatabase beatmaps = null, RulesetDatabase rulesets = null) : base(storage, connection)
+        public ScoreDatabase(Storage storage, SQLiteConnection connection, IIpcHost importHost = null, BeatmapStore beatmaps = null, RulesetDatabase rulesets = null) : base(storage, connection)
         {
             this.storage = storage;
             this.beatmaps = beatmaps;

osu.Game/Screens/Menu/Intro.cs

@@ -9,9 +9,9 @@ using osu.Framework.Configuration;
 using osu.Framework.Screens;
 using osu.Framework.Graphics;
 using osu.Framework.MathUtils;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.IO;
 using osu.Game.Configuration;
-using osu.Game.Database;
 using osu.Game.Graphics.Containers;
 using osu.Game.Screens.Backgrounds;
 using OpenTK.Graphics;

osu.Game/Screens/Multiplayer/DrawableRoom.cs

@@ -10,8 +10,8 @@ using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;

osu.Game/Screens/Multiplayer/ModeTypeInfo.cs

@@ -4,8 +4,8 @@
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Database;
 using osu.Game.Online.Multiplayer;
 
 namespace osu.Game.Screens.Multiplayer

osu.Game/Screens/Multiplayer/RoomInspector.cs

@@ -13,8 +13,8 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Cursor;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Localisation;
+using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.Sprites;

osu.Game/Screens/OsuScreen.cs

@@ -6,11 +6,11 @@ using osu.Framework.Allocation;
 using osu.Framework.Configuration;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics.Containers;
 using OpenTK;
 using osu.Framework.Audio.Sample;
 using osu.Framework.Audio;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Screens
 {

osu.Game/Screens/Play/Player.cs

@@ -13,7 +13,6 @@ using osu.Framework.Logging;
 using osu.Framework.Screens;
 using osu.Framework.Timing;
 using osu.Game.Configuration;
-using osu.Game.Database;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.UI;
 using osu.Game.Screens.Backgrounds;

osu.Game/Screens/Play/PlayerLoader.cs

@@ -7,7 +7,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.Graphics.Sprites;
 using osu.Framework.Screens;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Screens.Backgrounds;

osu.Game/Screens/Ranking/ResultsPageScore.cs

@@ -15,7 +15,6 @@ using osu.Framework.Graphics.Sprites;
 using osu.Framework.Graphics.Textures;
 using osu.Framework.Localisation;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -4,7 +4,6 @@
 using OpenTK;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Database;
 using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -18,6 +17,7 @@ using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Threading;
 using osu.Framework.Configuration;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 
 namespace osu.Game.Screens.Select

osu.Game/Screens/Select/BeatmapDeleteDialog.cs

@@ -4,7 +4,6 @@
 using System;
 using osu.Framework.Allocation;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Overlays.Dialog;
 

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -6,7 +6,6 @@ using OpenTK.Graphics;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Graphics.UserInterface;
@@ -16,6 +15,7 @@ using osu.Game.Online.API;
 using osu.Game.Online.API.Requests;
 using osu.Framework.Threading;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Beatmaps;
 
 namespace osu.Game.Screens.Select
 {

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -14,7 +14,6 @@ using osu.Framework.Graphics.Containers;
 using osu.Framework.MathUtils;
 using osu.Game.Beatmaps;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Rulesets;

osu.Game/Screens/Select/FilterControl.cs

@@ -14,8 +14,8 @@ using osu.Game.Graphics.UserInterface;
 using osu.Game.Screens.Select.Filter;
 using Container = osu.Framework.Graphics.Containers.Container;
 using osu.Framework.Input;
-using osu.Game.Database;
 using osu.Framework.Graphics.Shapes;
+using osu.Game.Rulesets;
 
 namespace osu.Game.Screens.Select
 {

osu.Game/Screens/Select/FilterCriteria.cs

@@ -5,7 +5,7 @@ using System;
 using System.Collections.Generic;
 using System.Linq;
 using osu.Game.Beatmaps.Drawables;
-using osu.Game.Database;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Select.Filter;
 
 namespace osu.Game.Screens.Select

osu.Game/Screens/Select/Leaderboards/Leaderboard.cs

@@ -11,7 +11,7 @@ using osu.Framework.Graphics.Containers;
 using System;
 using osu.Framework.Allocation;
 using osu.Framework.Threading;
-using osu.Game.Database;
+using osu.Game.Beatmaps;
 using osu.Game.Graphics.Containers;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Rulesets.Scoring;

osu.Game/Screens/Select/SongSelect.cs

@@ -16,10 +16,10 @@ using osu.Framework.Input;
 using osu.Framework.Screens;
 using osu.Framework.Threading;
 using osu.Game.Beatmaps;
-using osu.Game.Database;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Containers;
 using osu.Game.Overlays;
+using osu.Game.Rulesets;
 using osu.Game.Screens.Backgrounds;
 using osu.Game.Screens.Select.Options;
 

osu.Game/osu.Game.csproj

@@ -127,7 +127,7 @@
     <Compile Include="Beatmaps\Timing\TimeSignatures.cs" />
     <Compile Include="Database\BeatmapMetrics.cs" />
     <Compile Include="Database\Database.cs" />
-    <Compile Include="Database\RulesetInfo.cs" />
+    <Compile Include="Rulesets\RulesetInfo.cs" />
     <Compile Include="Database\ScoreDatabase.cs" />
     <Compile Include="Graphics\Backgrounds\Triangles.cs" />
     <Compile Include="Graphics\Cursor\CursorTrail.cs" />
@@ -384,7 +384,7 @@
     <Compile Include="Users\UpdateableAvatar.cs" />
     <Compile Include="Users\User.cs" />
     <Compile Include="Graphics\UserInterface\Volume\VolumeControl.cs" />
-    <Compile Include="Database\BeatmapDatabase.cs" />
+    <Compile Include="Beatmaps\BeatmapStore.cs" />
     <Compile Include="Beatmaps\IO\ArchiveReader.cs" />
     <Compile Include="Beatmaps\Formats\BeatmapDecoder.cs" />
     <Compile Include="Beatmaps\Formats\OsuLegacyDecoder.cs" />
@@ -394,7 +394,7 @@
     <Compile Include="Database\BeatmapMetadata.cs" />
     <Compile Include="Database\BeatmapInfo.cs" />
     <Compile Include="Database\BeatmapDifficulty.cs" />
-    <Compile Include="Database\DatabaseWorkingBeatmap.cs" />
+    <Compile Include="Beatmaps\BeatmapStoreWorkingBeatmap.cs" />
     <Compile Include="Graphics\UserInterface\OsuButton.cs" />
     <Compile Include="Overlays\Settings\Sections\MaintenanceSection.cs" />
     <Compile Include="Overlays\Settings\SettingsSection.cs" />