Move services to right custom service dir