Moving existing data service to better dir. ref #28.