Sorting Database.cs, Complete missing files from previous commit