Major code refactoring on the "corisco" tool, plus including lots of missing files