Re-arrange scripts into neat folders