Renamed & touched some files for unit testing.
Merge branch 'master' of https://github.com/jashandeep-sohi/pds