renamed and reshaped the databaseconnectors