Cleanup restruct lib.sh dev