moved datasource and fixed some bugs

datasource has been moved to an external module, fixed some bugs
preventing the correct import by PowerPivot