CS
PSR2
CS
removing datasource to its own component
adding optional logger definitions