Merge "move native services under services/"