Reorganize database