Merge "rdbms: move some files under rdbms/database to subfolders"