Moved databases to folder + cosmetical change