change service folder
change service_dir
fix cleanup