Refactored scripts into /scripts