Moving around files
Added datasource module, move files
More classes to commons
Moved files to commons, deletion of some files