Service TODO
directory structure fixed
fix merge