cleaning up repo based on service directory reorg