- split utility functionality into its own file - add module loader so we can have modules - move all testsuites into own files - remove complicated testcase joining / splitting methods