Refacotred - resources for part 1 moved to new package
Data source created