Moved files
Merged two database plugins into one