Move service files back to source directory, rename systemd service file