Fixes service.sh typo, refactored build script
Fixes service.sh restart