Refactor scripts into scenario folders