Code clean up

Got rid of the old DrupalConnector class by moving methods related to specific functionality to the corresponding class.