Re-organizing scripts into tidier hierarchy