Merge "[lib.sh] Split into multiple files for readability"