Moved all of the databases into their own db folder.
Merge remote-tracking branch 'origin/master'