From ec1adecb7a8ce44c8b8ce7344511f1c934940b3b Mon Sep 17 00:00:00 2001
From: Denis Buzdalov <public@buzden.ru>
Date: Thu, 14 Sep 2023 14:15:22 +0300
Subject: [PATCH] [ test ] Layout derivation tests differently

---
 .github/workflows/ci-deptycheck.yml           |  6 ++--
 .gitlab-ci.yml                                | 30 +++++++++----------
 .../derivation/_common/AlternativeCore.idr    |  0
 .../derivation/_common/PrintDerivation.idr    |  0
 .../derivation/_common/RunDerivedGen.idr      |  0
 .../derivation/_common/derive.ipkg            |  0
 .../derivation/_common/run                    |  0
 .../derivation/core/_common                   |  0
 .../core/norec nodep noext 001/DerivedGen.idr |  0
 .../norec nodep noext 001/RunDerivedGen.idr   |  0
 .../core/norec nodep noext 001/derive.ipkg    |  0
 .../core/norec nodep noext 001/expected       |  0
 .../core/norec nodep noext 001}/run           |  0
 .../core/norec nodep noext 002/DerivedGen.idr |  0
 .../norec nodep noext 002/RunDerivedGen.idr   |  0
 .../core/norec nodep noext 002/derive.ipkg    |  0
 .../core/norec nodep noext 002/expected       |  0
 .../core/norec nodep noext 002}/run           |  0
 .../norec nodep noext 003-neg/DerivedGen.idr  |  0
 .../RunDerivedGen.idr                         |  0
 .../norec nodep noext 003-neg/derive.ipkg     |  0
 .../core/norec nodep noext 003-neg/expected   |  0
 .../core/norec nodep noext 003-neg}/run       |  0
 .../norec nodep noext 004-neg/DerivedGen.idr  |  0
 .../RunDerivedGen.idr                         |  0
 .../norec nodep noext 004-neg/derive.ipkg     |  0
 .../core/norec nodep noext 004-neg/expected   |  0
 .../core/norec nodep noext 004-neg}/run       |  0
 .../norec nodep noext 005-neg/DerivedGen.idr  |  0
 .../RunDerivedGen.idr                         |  0
 .../norec nodep noext 005-neg/derive.ipkg     |  0
 .../core/norec nodep noext 005-neg/expected   |  0
 .../core/norec nodep noext 005-neg}/run       |  0
 .../core/norec nodep w_ext 001/DerivedGen.idr |  0
 .../norec nodep w_ext 001/RunDerivedGen.idr   |  0
 .../core/norec nodep w_ext 001/derive.ipkg    |  0
 .../core/norec nodep w_ext 001/expected       |  0
 .../core/norec nodep w_ext 001}/run           |  0
 .../core/norec nodep w_ext 002/DerivedGen.idr |  0
 .../norec nodep w_ext 002/RunDerivedGen.idr   |  0
 .../core/norec nodep w_ext 002/derive.ipkg    |  0
 .../core/norec nodep w_ext 002/expected       |  0
 .../core/norec nodep w_ext 002}/run           |  0
 .../core/norec nodep w_ext 003/DerivedGen.idr |  0
 .../norec nodep w_ext 003/RunDerivedGen.idr   |  0
 .../core/norec nodep w_ext 003/derive.ipkg    |  0
 .../core/norec nodep w_ext 003/expected       |  0
 .../core/norec nodep w_ext 003}/run           |  0
 .../core/norec nodep w_ext 004/DerivedGen.idr |  0
 .../norec nodep w_ext 004/RunDerivedGen.idr   |  0
 .../core/norec nodep w_ext 004/derive.ipkg    |  0
 .../core/norec nodep w_ext 004/expected       |  0
 .../core/norec nodep w_ext 004}/run           |  0
 .../core/norec nodep w_ext 005/DerivedGen.idr |  0
 .../norec nodep w_ext 005/RunDerivedGen.idr   |  0
 .../core/norec nodep w_ext 005/derive.ipkg    |  0
 .../core/norec nodep w_ext 005/expected       |  0
 .../core/norec nodep w_ext 005}/run           |  0
 .../core/norec nodep w_ext 006/DerivedGen.idr |  0
 .../norec nodep w_ext 006/RunDerivedGen.idr   |  0
 .../core/norec nodep w_ext 006/derive.ipkg    |  0
 .../core/norec nodep w_ext 006/expected       |  0
 .../core/norec nodep w_ext 006}/run           |  0
 .../core/norec nodep w_ext 007/DerivedGen.idr |  0
 .../norec nodep w_ext 007/RunDerivedGen.idr   |  0
 .../core/norec nodep w_ext 007/derive.ipkg    |  0
 .../core/norec nodep w_ext 007/expected       |  0
 .../core/norec nodep w_ext 007}/run           |  0
 .../norec part noext 001-neg/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec part noext 001-neg/derive.ipkg |  0
 .../core/norec part noext 001-neg/expected    |  0
 .../core/norec part noext 001-neg}/run        |  0
 .../norec part noext 002-neg/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec part noext 002-neg/derive.ipkg |  0
 .../core/norec part noext 002-neg/expected    |  0
 .../core/norec part noext 002-neg}/run        |  0
 .../core/norec part noext 003/DerivedGen.idr  |  0
 .../norec part noext 003/RunDerivedGen.idr    |  0
 .../core/norec part noext 003/derive.ipkg     |  0
 .../core/norec part noext 003/expected        |  0
 .../core/norec part noext 003}/run            |  0
 .../core/norec part noext 004/DerivedGen.idr  |  0
 .../norec part noext 004/RunDerivedGen.idr    |  0
 .../core/norec part noext 004/derive.ipkg     |  0
 .../core/norec part noext 004/expected        |  0
 .../core/norec part noext 004}/run            |  0
 .../core/norec part noext 005/DerivedGen.idr  |  0
 .../norec part noext 005/RunDerivedGen.idr    |  0
 .../core/norec part noext 005/derive.ipkg     |  0
 .../core/norec part noext 005/expected        |  0
 .../core/norec part noext 005}/run            |  0
 .../core/norec part w_ext 001/DerivedGen.idr  |  0
 .../norec part w_ext 001/RunDerivedGen.idr    |  0
 .../core/norec part w_ext 001/derive.ipkg     |  0
 .../core/norec part w_ext 001/expected        |  0
 .../core/norec part w_ext 001}/run            |  0
 .../core/norec part w_ext 002/DerivedGen.idr  |  0
 .../norec part w_ext 002/RunDerivedGen.idr    |  0
 .../core/norec part w_ext 002/derive.ipkg     |  0
 .../core/norec part w_ext 002/expected        |  0
 .../core/norec part w_ext 002}/run            |  0
 .../core/norec part w_ext 003/DerivedGen.idr  |  0
 .../norec part w_ext 003/RunDerivedGen.idr    |  0
 .../core/norec part w_ext 003/derive.ipkg     |  0
 .../core/norec part w_ext 003/expected        |  0
 .../core/norec part w_ext 003}/run            |  0
 .../norec part w_ext 004-neg/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec part w_ext 004-neg/derive.ipkg |  0
 .../core/norec part w_ext 004-neg/expected    |  0
 .../core/norec part w_ext 004-neg}/run        |  0
 .../norec part w_ext 005-neg/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec part w_ext 005-neg/derive.ipkg |  0
 .../core/norec part w_ext 005-neg/expected    |  0
 .../core/norec part w_ext 005-neg}/run        |  0
 .../norec part w_ext 006-neg/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec part w_ext 006-neg/derive.ipkg |  0
 .../core/norec part w_ext 006-neg/expected    |  0
 .../core/norec part w_ext 006-neg}/run        |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../norec t-..->p. noext 001-shdw/derive.ipkg |  0
 .../norec t-..->p. noext 001-shdw/expected    |  0
 .../core/norec t-..->p. noext 001-shdw}/run   |  0
 .../norec t-..->p. noext 001/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-..->p. noext 001/derive.ipkg |  0
 .../core/norec t-..->p. noext 001/expected    |  0
 .../core/norec t-..->p. noext 001}/run        |  0
 .../norec t-..->p. noext 002/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-..->p. noext 002/derive.ipkg |  0
 .../core/norec t-..->p. noext 002/expected    |  0
 .../core/norec t-..->p. noext 002}/run        |  0
 .../norec t-p.->.. noext 001/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-p.->.. noext 001/derive.ipkg |  0
 .../core/norec t-p.->.. noext 001/expected    |  0
 .../core/norec t-p.->.. noext 001}/run        |  0
 .../norec t-p.->.. noext 002/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-p.->.. noext 002/derive.ipkg |  0
 .../core/norec t-p.->.. noext 002/expected    |  0
 .../core/norec t-p.->.. noext 002}/run        |  0
 .../norec t-p.->.. noext 003/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-p.->.. noext 003/derive.ipkg |  0
 .../core/norec t-p.->.. noext 003/expected    |  0
 .../core/norec t-p.->.. noext 003}/run        |  0
 .../norec t-p.->.. w_ext 001/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-p.->.. w_ext 001/derive.ipkg |  0
 .../core/norec t-p.->.. w_ext 001/expected    |  0
 .../core/norec t-p.->.. w_ext 001}/run        |  0
 .../norec t-p.->.. w_ext 002/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-p.->.. w_ext 002/derive.ipkg |  0
 .../core/norec t-p.->.. w_ext 002/expected    |  0
 .../core/norec t-p.->.. w_ext 002}/run        |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../norec t-p.->.. w_ext 003-neg/derive.ipkg  |  0
 .../norec t-p.->.. w_ext 003-neg/expected     |  0
 .../core/norec t-p.->.. w_ext 003-neg}/run    |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../norec t-p.->.. w_ext 004-neg/derive.ipkg  |  0
 .../norec t-p.->.. w_ext 004-neg/expected     |  0
 .../core/norec t-p.->.. w_ext 004-neg}/run    |  0
 .../norec t-p.->.. w_ext 005/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-p.->.. w_ext 005/derive.ipkg |  0
 .../core/norec t-p.->.. w_ext 005/expected    |  0
 .../core/norec t-p.->.. w_ext 005}/run        |  0
 .../norec t-p.->.. w_ext 006/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-p.->.. w_ext 006/derive.ipkg |  0
 .../core/norec t-p.->.. w_ext 006/expected    |  0
 .../core/norec t-p.->.. w_ext 006}/run        |  0
 .../norec t-pi->.. noext 001/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-pi->.. noext 001/derive.ipkg |  0
 .../core/norec t-pi->.. noext 001/expected    |  0
 .../core/norec t-pi->.. noext 001}/run        |  0
 .../norec t-pi->.. noext 002/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-pi->.. noext 002/derive.ipkg |  0
 .../core/norec t-pi->.. noext 002/expected    |  0
 .../core/norec t-pi->.. noext 002}/run        |  0
 .../norec t-pi->.. noext 003/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-pi->.. noext 003/derive.ipkg |  0
 .../core/norec t-pi->.. noext 003/expected    |  0
 .../core/norec t-pi->.. noext 003}/run        |  0
 .../norec t-pi->.. noext 004/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-pi->.. noext 004/derive.ipkg |  0
 .../core/norec t-pi->.. noext 004/expected    |  0
 .../core/norec t-pi->.. noext 004}/run        |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../norec t-pi->.. w_ext 001-shdw/derive.ipkg |  0
 .../norec t-pi->.. w_ext 001-shdw}/dont-run   |  0
 .../norec t-pi->.. w_ext 001-shdw/expected    |  0
 .../norec t-pi->.. w_ext 001/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-pi->.. w_ext 001/derive.ipkg |  0
 .../core/norec t-pi->.. w_ext 001}/dont-run   |  0
 .../core/norec t-pi->.. w_ext 001/expected    |  0
 .../norec t-pi->.. w_ext 002/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../core/norec t-pi->.. w_ext 002/derive.ipkg |  0
 .../core/norec t-pi->.. w_ext 002/expected    |  0
 .../core/norec t-pi->.. w_ext 002}/run        |  0
 .../derivation/core/tests-roadmap             |  0
 .../core/trivial 001/DerivedGen.idr           |  0
 .../core/trivial 001/RunDerivedGen.idr        |  0
 .../derivation/core/trivial 001/derive.ipkg   |  0
 .../derivation/core/trivial 001/expected      |  0
 .../core/trivial 001}/run                     |  0
 .../core/trivial 002-neg/DerivedGen.idr       |  0
 .../core/trivial 002-neg/RunDerivedGen.idr    |  0
 .../core/trivial 002-neg/derive.ipkg          |  0
 .../derivation/core/trivial 002-neg/expected  |  0
 .../core/trivial 002-neg}/run                 |  0
 .../core/trivial 003-neg/DerivedGen.idr       |  0
 .../core/trivial 003-neg/RunDerivedGen.idr    |  0
 .../core/trivial 003-neg/derive.ipkg          |  0
 .../derivation/core/trivial 003-neg/expected  |  0
 .../core/trivial 003-neg}/run                 |  0
 .../core/trivial 004-neg/DerivedGen.idr       |  0
 .../core/trivial 004-neg/RunDerivedGen.idr    |  0
 .../core/trivial 004-neg/derive.ipkg          |  0
 .../derivation/core/trivial 004-neg/expected  |  0
 .../core/trivial 004-neg}/run                 |  0
 .../core/typealias con 001/DerivedGen.idr     |  0
 .../core/typealias con 001/RunDerivedGen.idr  |  0
 .../core/typealias con 001/derive.ipkg        |  0
 .../core/typealias con 001/expected           |  0
 .../core/typealias con 001}/run               |  0
 .../core/typealias con 002/DerivedGen.idr     |  0
 .../core/typealias con 002/RunDerivedGen.idr  |  0
 .../core/typealias con 002/derive.ipkg        |  0
 .../core/typealias con 002/expected           |  0
 .../core/typealias con 002}/run               |  0
 .../core/typealias con 003-neg/DerivedGen.idr |  0
 .../typealias con 003-neg/RunDerivedGen.idr   |  0
 .../core/typealias con 003-neg/derive.ipkg    |  0
 .../core/typealias con 003-neg/expected       |  0
 .../core/typealias con 003-neg}/run           |  0
 .../core/upstream-2983/DerivedGen.idr         |  0
 .../core/upstream-2983/RunDerivedGen.idr      |  0
 .../derivation/core/upstream-2983/derive.ipkg |  0
 .../derivation/core/upstream-2983/expected    |  0
 .../core/upstream-2983}/run                   |  0
 tests/derivation/distribution/_common         |  1 +
 .../list-nat-001/CheckDistribution.idr        |  0
 .../list-nat-001/DistrCheckCommon.idr         |  0
 .../distribution/list-nat-001/expected        |  0
 .../distribution/list-nat-001}/run            |  0
 .../distribution/list-nat-001/test.ipkg       |  0
 .../list-nat-002/CheckDistribution.idr        |  0
 .../list-nat-002/DistrCheckCommon.idr         |  0
 .../distribution/list-nat-002/expected        |  0
 .../distribution/list-nat-002}/run            |  0
 .../distribution/list-nat-002/test.ipkg       |  0
 .../nats-001/CheckDistribution.idr            |  0
 .../nats-001/DistrCheckCommon.idr             |  0
 .../derivation/distribution/nats-001/expected |  0
 .../distribution/nats-001}/run                |  0
 .../distribution/nats-001/test.ipkg           |  0
 .../vect-nat-001/CheckDistribution.idr        |  0
 .../vect-nat-001/DistrCheckCommon.idr         |  0
 .../distribution/vect-nat-001/expected        |  0
 .../distribution/vect-nat-001}/run            |  0
 .../distribution/vect-nat-001/test.ipkg       |  0
 .../derivation/infra/_common                  |  0
 .../empty-body print 001/AlternativeCore.idr  |  0
 .../infra/empty-body print 001/DerivedGen.idr |  0
 .../empty-body print 001/PrintDerivation.idr  |  0
 .../empty-body print 001/RunDerivedGen.idr    |  0
 .../infra/empty-body print 001/derive.ipkg    |  0
 .../infra/empty-body print 001/expected       |  0
 .../infra/empty-body print 001}/run           |  0
 .../empty-body print 002/AlternativeCore.idr  |  0
 .../infra/empty-body print 002/DerivedGen.idr |  0
 .../empty-body print 002/PrintDerivation.idr  |  0
 .../empty-body print 002/RunDerivedGen.idr    |  0
 .../infra/empty-body print 002/derive.ipkg    |  0
 .../infra/empty-body print 002/expected       |  0
 .../infra/empty-body print 002}/run           |  0
 .../empty-body print 003/AlternativeCore.idr  |  0
 .../infra/empty-body print 003/DerivedGen.idr |  0
 .../empty-body print 003/PrintDerivation.idr  |  0
 .../empty-body print 003/RunDerivedGen.idr    |  0
 .../infra/empty-body print 003/derive.ipkg    |  0
 .../infra/empty-body print 003/expected       |  0
 .../infra/empty-body print 003}/run           |  0
 .../empty-body print 004/AlternativeCore.idr  |  0
 .../infra/empty-body print 004/DerivedGen.idr |  0
 .../empty-body print 004/PrintDerivation.idr  |  0
 .../empty-body print 004/RunDerivedGen.idr    |  0
 .../infra/empty-body print 004/derive.ipkg    |  0
 .../infra/empty-body print 004/expected       |  0
 .../infra/empty-body print 004}/run           |  0
 .../empty-body print 005/AlternativeCore.idr  |  0
 .../infra/empty-body print 005/DerivedGen.idr |  0
 .../empty-body print 005/PrintDerivation.idr  |  0
 .../empty-body print 005/RunDerivedGen.idr    |  0
 .../infra/empty-body print 005/derive.ipkg    |  0
 .../infra/empty-body print 005/expected       |  0
 .../infra/empty-body print 005}/run           |  0
 .../empty-body print 006/AlternativeCore.idr  |  0
 .../infra/empty-body print 006/DerivedGen.idr |  0
 .../empty-body print 006/PrintDerivation.idr  |  0
 .../empty-body print 006/RunDerivedGen.idr    |  0
 .../infra/empty-body print 006/derive.ipkg    |  0
 .../infra/empty-body print 006/expected       |  0
 .../infra/empty-body print 006}/run           |  0
 .../empty-body print 007/AlternativeCore.idr  |  0
 .../infra/empty-body print 007/DerivedGen.idr |  0
 .../empty-body print 007/PrintDerivation.idr  |  0
 .../empty-body print 007/RunDerivedGen.idr    |  0
 .../infra/empty-body print 007/derive.ipkg    |  0
 .../infra/empty-body print 007/expected       |  0
 .../infra/empty-body print 007}/run           |  0
 .../empty-body print 008/AlternativeCore.idr  |  0
 .../infra/empty-body print 008/DerivedGen.idr |  0
 .../empty-body print 008/PrintDerivation.idr  |  0
 .../empty-body print 008/RunDerivedGen.idr    |  0
 .../infra/empty-body print 008/derive.ipkg    |  0
 .../infra/empty-body print 008/expected       |  0
 .../infra/empty-body print 008}/run           |  0
 .../empty-body run 001/AlternativeCore.idr    |  0
 .../infra/empty-body run 001/DerivedGen.idr   |  0
 .../empty-body run 001/RunDerivedGen.idr      |  0
 .../infra/empty-body run 001/derive.ipkg      |  0
 .../infra/empty-body run 001/expected         |  0
 .../infra/empty-body run 001}/run             |  0
 .../empty-body run 002/AlternativeCore.idr    |  0
 .../infra/empty-body run 002/DerivedGen.idr   |  0
 .../empty-body run 002/RunDerivedGen.idr      |  0
 .../infra/empty-body run 002/derive.ipkg      |  0
 .../infra/empty-body run 002/expected         |  0
 .../infra/empty-body run 002}/run             |  0
 .../empty-body run 003/AlternativeCore.idr    |  0
 .../infra/empty-body run 003/DerivedGen.idr   |  0
 .../empty-body run 003/RunDerivedGen.idr      |  0
 .../infra/empty-body run 003/derive.ipkg      |  0
 .../infra/empty-body run 003/expected         |  0
 .../infra/empty-body run 003}/run             |  0
 .../empty-body run 004/AlternativeCore.idr    |  0
 .../infra/empty-body run 004/DerivedGen.idr   |  0
 .../empty-body run 004/RunDerivedGen.idr      |  0
 .../infra/empty-body run 004/derive.ipkg      |  0
 .../infra/empty-body run 004/expected         |  0
 .../infra/empty-body run 004}/run             |  0
 .../empty-body run 005/AlternativeCore.idr    |  0
 .../infra/empty-body run 005/DerivedGen.idr   |  0
 .../empty-body run 005/RunDerivedGen.idr      |  0
 .../infra/empty-body run 005/derive.ipkg      |  0
 .../infra/empty-body run 005/expected         |  0
 .../infra/empty-body run 005}/run             |  0
 .../empty-body run 006/AlternativeCore.idr    |  0
 .../infra/empty-body run 006/DerivedGen.idr   |  0
 .../empty-body run 006/RunDerivedGen.idr      |  0
 .../infra/empty-body run 006/derive.ipkg      |  0
 .../infra/empty-body run 006/expected         |  0
 .../infra/empty-body run 006}/run             |  0
 .../empty-body run 007/AlternativeCore.idr    |  0
 .../infra/empty-body run 007/DerivedGen.idr   |  0
 .../empty-body run 007/RunDerivedGen.idr      |  0
 .../infra/empty-body run 007/derive.ipkg      |  0
 .../infra/empty-body run 007/expected         |  0
 .../infra/empty-body run 007}/run             |  0
 .../empty-body run 008/AlternativeCore.idr    |  0
 .../infra/empty-body run 008/DerivedGen.idr   |  0
 .../empty-body run 008/RunDerivedGen.idr      |  0
 .../infra/empty-body run 008/derive.ipkg      |  0
 .../infra/empty-body run 008/expected         |  0
 .../infra/empty-body run 008}/run             |  0
 .../empty-body run 009/AlternativeCore.idr    |  0
 .../infra/empty-body run 009/DerivedGen.idr   |  0
 .../empty-body run 009/RunDerivedGen.idr      |  0
 .../infra/empty-body run 009/derive.ipkg      |  0
 .../infra/empty-body run 009/expected         |  0
 .../infra/empty-body run 009}/run             |  0
 .../empty-body run 010/AlternativeCore.idr    |  0
 .../infra/empty-body run 010/DerivedGen.idr   |  0
 .../empty-body run 010/RunDerivedGen.idr      |  0
 .../infra/empty-body run 010/derive.ipkg      |  0
 .../infra/empty-body run 010/expected         |  0
 .../infra/empty-body run 010}/run             |  0
 .../empty-cons print 001/AlternativeCore.idr  |  0
 .../infra/empty-cons print 001/DerivedGen.idr |  0
 .../empty-cons print 001/PrintDerivation.idr  |  0
 .../empty-cons print 001/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 001/derive.ipkg    |  0
 .../infra/empty-cons print 001/expected       |  0
 .../infra/empty-cons print 001}/run           |  0
 .../empty-cons print 002/AlternativeCore.idr  |  0
 .../infra/empty-cons print 002/DerivedGen.idr |  0
 .../empty-cons print 002/PrintDerivation.idr  |  0
 .../empty-cons print 002/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 002/derive.ipkg    |  0
 .../infra/empty-cons print 002/expected       |  0
 .../infra/empty-cons print 002}/run           |  0
 .../empty-cons print 003/AlternativeCore.idr  |  0
 .../infra/empty-cons print 003/DerivedGen.idr |  0
 .../empty-cons print 003/PrintDerivation.idr  |  0
 .../empty-cons print 003/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 003/derive.ipkg    |  0
 .../infra/empty-cons print 003/expected       |  0
 .../infra/empty-cons print 003}/run           |  0
 .../empty-cons print 004/AlternativeCore.idr  |  0
 .../infra/empty-cons print 004/DerivedGen.idr |  0
 .../empty-cons print 004/PrintDerivation.idr  |  0
 .../empty-cons print 004/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 004/derive.ipkg    |  0
 .../infra/empty-cons print 004/expected       |  0
 .../infra/empty-cons print 004}/run           |  0
 .../empty-cons print 005/AlternativeCore.idr  |  0
 .../infra/empty-cons print 005/DerivedGen.idr |  0
 .../empty-cons print 005/PrintDerivation.idr  |  0
 .../empty-cons print 005/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 005/derive.ipkg    |  0
 .../infra/empty-cons print 005/expected       |  0
 .../infra/empty-cons print 005}/run           |  0
 .../empty-cons print 006/AlternativeCore.idr  |  0
 .../infra/empty-cons print 006/DerivedGen.idr |  0
 .../empty-cons print 006/PrintDerivation.idr  |  0
 .../empty-cons print 006/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 006/derive.ipkg    |  0
 .../infra/empty-cons print 006/expected       |  0
 .../infra/empty-cons print 006}/run           |  0
 .../empty-cons print 007/AlternativeCore.idr  |  0
 .../infra/empty-cons print 007/DerivedGen.idr |  0
 .../empty-cons print 007/PrintDerivation.idr  |  0
 .../empty-cons print 007/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 007/derive.ipkg    |  0
 .../infra/empty-cons print 007/expected       |  0
 .../infra/empty-cons print 007}/run           |  0
 .../empty-cons print 008/AlternativeCore.idr  |  0
 .../infra/empty-cons print 008/DerivedGen.idr |  0
 .../empty-cons print 008/PrintDerivation.idr  |  0
 .../empty-cons print 008/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 008/derive.ipkg    |  0
 .../infra/empty-cons print 008/expected       |  0
 .../infra/empty-cons print 008}/run           |  0
 .../empty-cons print 009/AlternativeCore.idr  |  0
 .../infra/empty-cons print 009/DerivedGen.idr |  0
 .../empty-cons print 009/PrintDerivation.idr  |  0
 .../empty-cons print 009/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 009/derive.ipkg    |  0
 .../infra/empty-cons print 009/expected       |  0
 .../infra/empty-cons print 009}/run           |  0
 .../empty-cons print 010/AlternativeCore.idr  |  0
 .../infra/empty-cons print 010/DerivedGen.idr |  0
 .../empty-cons print 010/PrintDerivation.idr  |  0
 .../empty-cons print 010/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 010/derive.ipkg    |  0
 .../infra/empty-cons print 010/expected       |  0
 .../infra/empty-cons print 010}/run           |  0
 .../empty-cons print 011/AlternativeCore.idr  |  0
 .../infra/empty-cons print 011/DerivedGen.idr |  0
 .../empty-cons print 011/PrintDerivation.idr  |  0
 .../empty-cons print 011/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 011/derive.ipkg    |  0
 .../infra/empty-cons print 011/expected       |  0
 .../infra/empty-cons print 011}/run           |  0
 .../empty-cons print 012/AlternativeCore.idr  |  0
 .../infra/empty-cons print 012/DerivedGen.idr |  0
 .../empty-cons print 012/PrintDerivation.idr  |  0
 .../empty-cons print 012/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 012/derive.ipkg    |  0
 .../infra/empty-cons print 012/expected       |  0
 .../infra/empty-cons print 012}/run           |  0
 .../empty-cons print 013/AlternativeCore.idr  |  0
 .../infra/empty-cons print 013/DerivedGen.idr |  0
 .../empty-cons print 013/PrintDerivation.idr  |  0
 .../empty-cons print 013/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 013/derive.ipkg    |  0
 .../infra/empty-cons print 013/expected       |  0
 .../infra/empty-cons print 013}/run           |  0
 .../empty-cons print 014/AlternativeCore.idr  |  0
 .../infra/empty-cons print 014/DerivedGen.idr |  0
 .../empty-cons print 014/PrintDerivation.idr  |  0
 .../empty-cons print 014/RunDerivedGen.idr    |  0
 .../infra/empty-cons print 014/derive.ipkg    |  0
 .../infra/empty-cons print 014/expected       |  0
 .../infra/empty-cons print 014}/run           |  0
 .../empty-cons run 001/AlternativeCore.idr    |  0
 .../infra/empty-cons run 001/DerivedGen.idr   |  0
 .../empty-cons run 001/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 001/derive.ipkg      |  0
 .../infra/empty-cons run 001/expected         |  0
 .../infra/empty-cons run 001}/run             |  0
 .../empty-cons run 002/AlternativeCore.idr    |  0
 .../infra/empty-cons run 002/DerivedGen.idr   |  0
 .../empty-cons run 002/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 002/derive.ipkg      |  0
 .../infra/empty-cons run 002/expected         |  0
 .../infra/empty-cons run 002}/run             |  0
 .../empty-cons run 003/AlternativeCore.idr    |  0
 .../infra/empty-cons run 003/DerivedGen.idr   |  0
 .../empty-cons run 003/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 003/derive.ipkg      |  0
 .../infra/empty-cons run 003/expected         |  0
 .../infra/empty-cons run 003}/run             |  0
 .../empty-cons run 004/AlternativeCore.idr    |  0
 .../infra/empty-cons run 004/DerivedGen.idr   |  0
 .../empty-cons run 004/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 004/derive.ipkg      |  0
 .../infra/empty-cons run 004/expected         |  0
 .../infra/empty-cons run 004}/run             |  0
 .../empty-cons run 005/AlternativeCore.idr    |  0
 .../infra/empty-cons run 005/DerivedGen.idr   |  0
 .../empty-cons run 005/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 005/derive.ipkg      |  0
 .../infra/empty-cons run 005/expected         |  0
 .../infra/empty-cons run 005}/run             |  0
 .../empty-cons run 006/AlternativeCore.idr    |  0
 .../infra/empty-cons run 006/DerivedGen.idr   |  0
 .../empty-cons run 006/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 006/derive.ipkg      |  0
 .../infra/empty-cons run 006/expected         |  0
 .../infra/empty-cons run 006}/run             |  0
 .../empty-cons run 007/AlternativeCore.idr    |  0
 .../infra/empty-cons run 007/DerivedGen.idr   |  0
 .../empty-cons run 007/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 007/derive.ipkg      |  0
 .../infra/empty-cons run 007/expected         |  0
 .../infra/empty-cons run 007}/run             |  0
 .../empty-cons run 008/AlternativeCore.idr    |  0
 .../infra/empty-cons run 008/DerivedGen.idr   |  0
 .../empty-cons run 008/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 008/derive.ipkg      |  0
 .../infra/empty-cons run 008/expected         |  0
 .../infra/empty-cons run 008}/run             |  0
 .../empty-cons run 009/AlternativeCore.idr    |  0
 .../infra/empty-cons run 009/DerivedGen.idr   |  0
 .../empty-cons run 009/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 009/derive.ipkg      |  0
 .../infra/empty-cons run 009/expected         |  0
 .../infra/empty-cons run 009}/run             |  0
 .../empty-cons run 010/AlternativeCore.idr    |  0
 .../infra/empty-cons run 010/DerivedGen.idr   |  0
 .../empty-cons run 010/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 010/derive.ipkg      |  0
 .../infra/empty-cons run 010/expected         |  0
 .../infra/empty-cons run 010}/run             |  0
 .../empty-cons run 011/AlternativeCore.idr    |  0
 .../infra/empty-cons run 011/DerivedGen.idr   |  0
 .../empty-cons run 011/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 011/derive.ipkg      |  0
 .../infra/empty-cons run 011/expected         |  0
 .../infra/empty-cons run 011}/run             |  0
 .../empty-cons run 012/AlternativeCore.idr    |  0
 .../infra/empty-cons run 012/DerivedGen.idr   |  0
 .../empty-cons run 012/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 012/derive.ipkg      |  0
 .../infra/empty-cons run 012/expected         |  0
 .../infra/empty-cons run 012}/run             |  0
 .../empty-cons run 013/AlternativeCore.idr    |  0
 .../infra/empty-cons run 013/DerivedGen.idr   |  0
 .../empty-cons run 013/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 013/derive.ipkg      |  0
 .../infra/empty-cons run 013}/dont-run        |  0
 .../infra/empty-cons run 013/expected         |  0
 .../empty-cons run 014/AlternativeCore.idr    |  0
 .../infra/empty-cons run 014/DerivedGen.idr   |  0
 .../empty-cons run 014/RunDerivedGen.idr      |  0
 .../infra/empty-cons run 014/derive.ipkg      |  0
 .../infra/empty-cons run 014/expected         |  0
 .../infra/empty-cons run 014}/run             |  0
 .../infra/ext print 001/AlternativeCore.idr   |  0
 .../infra/ext print 001/DerivedGen.idr        |  0
 .../infra/ext print 001/PrintDerivation.idr   |  0
 .../infra/ext print 001/RunDerivedGen.idr     |  0
 .../infra/ext print 001/derive.ipkg           |  0
 .../derivation/infra/ext print 001/expected   |  0
 .../infra/ext print 001}/run                  |  0
 .../infra/ext print 002/AlternativeCore.idr   |  0
 .../infra/ext print 002/DerivedGen.idr        |  0
 .../infra/ext print 002/PrintDerivation.idr   |  0
 .../infra/ext print 002/RunDerivedGen.idr     |  0
 .../infra/ext print 002/derive.ipkg           |  0
 .../derivation/infra/ext print 002/expected   |  0
 .../infra/ext print 002}/run                  |  0
 .../infra/ext print 003/AlternativeCore.idr   |  0
 .../infra/ext print 003/DerivedGen.idr        |  0
 .../infra/ext print 003/PrintDerivation.idr   |  0
 .../infra/ext print 003/RunDerivedGen.idr     |  0
 .../infra/ext print 003/derive.ipkg           |  0
 .../derivation/infra/ext print 003/expected   |  0
 .../infra/ext print 003}/run                  |  0
 .../infra/ext print 004/AlternativeCore.idr   |  0
 .../infra/ext print 004/DerivedGen.idr        |  0
 .../infra/ext print 004/PrintDerivation.idr   |  0
 .../infra/ext print 004/RunDerivedGen.idr     |  0
 .../infra/ext print 004/derive.ipkg           |  0
 .../derivation/infra/ext print 004/expected   |  0
 .../infra/ext print 004}/run                  |  0
 .../infra/ext run 001/AlternativeCore.idr     |  0
 .../infra/ext run 001/DerivedGen.idr          |  0
 .../infra/ext run 001/RunDerivedGen.idr       |  0
 .../derivation/infra/ext run 001/derive.ipkg  |  0
 .../derivation/infra/ext run 001/expected     |  0
 .../infra/ext run 001}/run                    |  0
 .../infra/ext run 002/AlternativeCore.idr     |  0
 .../infra/ext run 002/DerivedGen.idr          |  0
 .../infra/ext run 002/RunDerivedGen.idr       |  0
 .../derivation/infra/ext run 002/derive.ipkg  |  0
 .../derivation/infra/ext run 002/expected     |  0
 .../infra/ext run 002}/run                    |  0
 .../infra/ext run 003/AlternativeCore.idr     |  0
 .../infra/ext run 003/DerivedGen.idr          |  0
 .../infra/ext run 003/RunDerivedGen.idr       |  0
 .../derivation/infra/ext run 003/derive.ipkg  |  0
 .../derivation/infra/ext run 003/expected     |  0
 .../infra/ext run 003}/run                    |  0
 .../infra/ext run 004/AlternativeCore.idr     |  0
 .../infra/ext run 004/DerivedGen.idr          |  0
 .../infra/ext run 004/RunDerivedGen.idr       |  0
 .../derivation/infra/ext run 004/derive.ipkg  |  0
 .../derivation/infra/ext run 004/expected     |  0
 .../infra/ext run 004}/run                    |  0
 .../infra/self print 001/AlternativeCore.idr  |  0
 .../infra/self print 001/DerivedGen.idr       |  0
 .../infra/self print 001/PrintDerivation.idr  |  0
 .../infra/self print 001/RunDerivedGen.idr    |  0
 .../infra/self print 001/derive.ipkg          |  0
 .../derivation/infra/self print 001/expected  |  0
 .../infra/self print 001}/run                 |  0
 .../infra/self print 002/AlternativeCore.idr  |  0
 .../infra/self print 002/DerivedGen.idr       |  0
 .../infra/self print 002/PrintDerivation.idr  |  0
 .../infra/self print 002/RunDerivedGen.idr    |  0
 .../infra/self print 002/derive.ipkg          |  0
 .../derivation/infra/self print 002/expected  |  0
 .../infra/self print 002}/run                 |  0
 .../infra/self print 003/AlternativeCore.idr  |  0
 .../infra/self print 003/DerivedGen.idr       |  0
 .../infra/self print 003/PrintDerivation.idr  |  0
 .../infra/self print 003/RunDerivedGen.idr    |  0
 .../infra/self print 003/derive.ipkg          |  0
 .../derivation/infra/self print 003/expected  |  0
 .../infra/self print 003}/run                 |  0
 .../infra/self print 004/AlternativeCore.idr  |  0
 .../infra/self print 004/DerivedGen.idr       |  0
 .../infra/self print 004/PrintDerivation.idr  |  0
 .../infra/self print 004/RunDerivedGen.idr    |  0
 .../infra/self print 004/derive.ipkg          |  0
 .../derivation/infra/self print 004/expected  |  0
 .../infra/self print 004}/run                 |  0
 .../infra/self print 005/AlternativeCore.idr  |  0
 .../infra/self print 005/DerivedGen.idr       |  0
 .../infra/self print 005/PrintDerivation.idr  |  0
 .../infra/self print 005/RunDerivedGen.idr    |  0
 .../infra/self print 005/derive.ipkg          |  0
 .../derivation/infra/self print 005/expected  |  0
 .../infra/self print 005}/run                 |  0
 .../infra/self print 006/AlternativeCore.idr  |  0
 .../infra/self print 006/DerivedGen.idr       |  0
 .../infra/self print 006/PrintDerivation.idr  |  0
 .../infra/self print 006/RunDerivedGen.idr    |  0
 .../infra/self print 006/derive.ipkg          |  0
 .../derivation/infra/self print 006/expected  |  0
 .../infra/self print 006}/run                 |  0
 .../infra/self print 007/AlternativeCore.idr  |  0
 .../infra/self print 007/DerivedGen.idr       |  0
 .../infra/self print 007/PrintDerivation.idr  |  0
 .../infra/self print 007/RunDerivedGen.idr    |  0
 .../infra/self print 007/derive.ipkg          |  0
 .../derivation/infra/self print 007/expected  |  0
 .../infra/self print 007}/run                 |  0
 .../infra/self print 008/AlternativeCore.idr  |  0
 .../infra/self print 008/DerivedGen.idr       |  0
 .../infra/self print 008/PrintDerivation.idr  |  0
 .../infra/self print 008/RunDerivedGen.idr    |  0
 .../infra/self print 008/derive.ipkg          |  0
 .../derivation/infra/self print 008/expected  |  0
 .../infra/self print 008}/run                 |  0
 .../infra/self run 001/AlternativeCore.idr    |  0
 .../infra/self run 001/DerivedGen.idr         |  0
 .../infra/self run 001/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 001/derive.ipkg |  0
 .../derivation/infra/self run 001/expected    |  0
 .../infra/self run 001}/run                   |  0
 .../infra/self run 002/AlternativeCore.idr    |  0
 .../infra/self run 002/DerivedGen.idr         |  0
 .../infra/self run 002/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 002/derive.ipkg |  0
 .../derivation/infra/self run 002/expected    |  0
 .../infra/self run 002}/run                   |  0
 .../infra/self run 003/AlternativeCore.idr    |  0
 .../infra/self run 003/DerivedGen.idr         |  0
 .../infra/self run 003/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 003/derive.ipkg |  0
 .../derivation/infra/self run 003/expected    |  0
 .../infra/self run 003}/run                   |  0
 .../infra/self run 004/AlternativeCore.idr    |  0
 .../infra/self run 004/DerivedGen.idr         |  0
 .../infra/self run 004/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 004/derive.ipkg |  0
 .../derivation/infra/self run 004/expected    |  0
 .../infra/self run 004}/run                   |  0
 .../infra/self run 005/AlternativeCore.idr    |  0
 .../infra/self run 005/DerivedGen.idr         |  0
 .../infra/self run 005/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 005/derive.ipkg |  0
 .../derivation/infra/self run 005/expected    |  0
 .../infra/self run 005}/run                   |  0
 .../infra/self run 006/AlternativeCore.idr    |  0
 .../infra/self run 006/DerivedGen.idr         |  0
 .../infra/self run 006/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 006/derive.ipkg |  0
 .../derivation/infra/self run 006/expected    |  0
 .../infra/self run 006}/run                   |  0
 .../infra/self run 007/AlternativeCore.idr    |  0
 .../infra/self run 007/DerivedGen.idr         |  0
 .../infra/self run 007/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 007/derive.ipkg |  0
 .../derivation/infra/self run 007/expected    |  0
 .../infra/self run 007}/run                   |  0
 .../infra/self run 008/AlternativeCore.idr    |  0
 .../infra/self run 008/DerivedGen.idr         |  0
 .../infra/self run 008/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 008/derive.ipkg |  0
 .../derivation/infra/self run 008/expected    |  0
 .../infra/self run 008}/run                   |  0
 .../infra/self run 009/AlternativeCore.idr    |  0
 .../infra/self run 009/DerivedGen.idr         |  0
 .../infra/self run 009/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 009/derive.ipkg |  0
 .../derivation/infra/self run 009/expected    |  0
 .../infra/self run 009}/run                   |  0
 .../infra/self run 010/AlternativeCore.idr    |  0
 .../infra/self run 010/DerivedGen.idr         |  0
 .../infra/self run 010/RunDerivedGen.idr      |  0
 .../derivation/infra/self run 010/derive.ipkg |  0
 .../derivation/infra/self run 010/expected    |  0
 .../infra/self run 010}/run                   |  0
 .../derivation/infra/tests-scheme             |  0
 .../inputvalidation/_common/run               |  0
 .../_common/validate-input.ipkg               |  0
 .../bad-args-in-target-type/ValidateInput.idr |  0
 .../bad-args-in-target-type/expected          |  0
 .../bad-args-in-target-type}/run              |  0
 .../validate-input.ipkg                       |  0
 .../bad-fuel/ValidateInput.idr                |  0
 .../inputvalidation/bad-fuel/expected         |  0
 .../inputvalidation/bad-fuel}/run             |  0
 .../bad-fuel/validate-input.ipkg              |  0
 .../bad-param-names/ValidateInput.idr         |  0
 .../inputvalidation/bad-param-names/expected  |  0
 .../inputvalidation/bad-param-names}/run      |  0
 .../bad-param-names/validate-input.ipkg       |  0
 .../external-gens/ValidateInput.idr           |  0
 .../inputvalidation/external-gens/expected    |  0
 .../inputvalidation/external-gens}/run        |  0
 .../external-gens/validate-input.ipkg         |  0
 .../non-gen-target-type/ValidateInput.idr     |  0
 .../non-gen-target-type/expected              |  0
 .../inputvalidation/non-gen-target-type}/run  |  0
 .../non-gen-target-type/validate-input.ipkg   |  0
 .../ValidateInput.idr                         |  0
 .../odd-or-lacking-gen-params/expected        |  0
 .../odd-or-lacking-gen-params}/run            |  0
 .../validate-input.ipkg                       |  0
 .../unexpected-gen-target/ValidateInput.idr   |  0
 .../unexpected-gen-target/expected            |  0
 .../unexpected-gen-target}/run                |  0
 .../unexpected-gen-target/validate-input.ipkg |  0
 .../unexpected-multiplicity/ValidateInput.idr |  0
 .../unexpected-multiplicity/expected          |  0
 .../unexpected-multiplicity}/run              |  0
 .../validate-input.ipkg                       |  0
 .../wrong-params-order/ValidateInput.idr      |  0
 .../wrong-params-order/expected               |  0
 .../inputvalidation/wrong-params-order}/run   |  0
 .../wrong-params-order/validate-input.ipkg    |  0
 .../print/adt/001 trivial/AlternativeCore.idr |  0
 .../print/adt/001 trivial/DerivedGen.idr      |  0
 .../print/adt/001 trivial/PrintDerivation.idr |  0
 .../print/adt/001 trivial/RunDerivedGen.idr   |  0
 .../print/adt/001 trivial/derive.ipkg         |  0
 .../print/adt/001 trivial/expected            |  0
 .../least-effort/print/adt/001 trivial}/run   |  0
 .../print/adt/002 noparam/AlternativeCore.idr |  0
 .../print/adt/002 noparam/DerivedGen.idr      |  0
 .../print/adt/002 noparam/PrintDerivation.idr |  0
 .../print/adt/002 noparam/RunDerivedGen.idr   |  0
 .../print/adt/002 noparam/derive.ipkg         |  0
 .../print/adt/002 noparam/expected            |  0
 .../least-effort/print/adt/002 noparam}/run   |  0
 .../print/adt/003 noparam/AlternativeCore.idr |  0
 .../print/adt/003 noparam/DerivedGen.idr      |  0
 .../print/adt/003 noparam/PrintDerivation.idr |  0
 .../print/adt/003 noparam/RunDerivedGen.idr   |  0
 .../print/adt/003 noparam/derive.ipkg         |  0
 .../print/adt/003 noparam/expected            |  0
 .../least-effort/print/adt/003 noparam}/run   |  0
 .../print/adt/004 noparam/AlternativeCore.idr |  0
 .../print/adt/004 noparam/DerivedGen.idr      |  0
 .../print/adt/004 noparam/PrintDerivation.idr |  0
 .../print/adt/004 noparam/RunDerivedGen.idr   |  0
 .../print/adt/004 noparam/derive.ipkg         |  0
 .../print/adt/004 noparam/expected            |  0
 .../least-effort/print/adt/004 noparam}/run   |  0
 .../print/adt/005 param/AlternativeCore.idr   |  0
 .../print/adt/005 param/DerivedGen.idr        |  0
 .../print/adt/005 param/PrintDerivation.idr   |  0
 .../print/adt/005 param/RunDerivedGen.idr     |  0
 .../print/adt/005 param/derive.ipkg           |  0
 .../least-effort/print/adt/005 param/expected |  0
 .../least-effort/print/adt/005 param}/run     |  0
 .../print/adt/006 param/AlternativeCore.idr   |  0
 .../print/adt/006 param/DerivedGen.idr        |  0
 .../print/adt/006 param/PrintDerivation.idr   |  0
 .../print/adt/006 param/RunDerivedGen.idr     |  0
 .../print/adt/006 param/derive.ipkg           |  0
 .../least-effort/print/adt/006 param/expected |  0
 .../least-effort/print/adt/006 param}/run     |  0
 .../AlternativeCore.idr                       |  0
 .../007 right-to-left simple/DerivedGen.idr   |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../adt/007 right-to-left simple/derive.ipkg  |  0
 .../adt/007 right-to-left simple/expected     |  0
 .../print/adt/007 right-to-left simple}/run   |  0
 .../AlternativeCore.idr                       |  0
 .../008 right-to-left simple/DerivedGen.idr   |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../adt/008 right-to-left simple/derive.ipkg  |  0
 .../adt/008 right-to-left simple/expected     |  0
 .../print/adt/008 right-to-left simple}/run   |  0
 .../adt/009 left-to-right/AlternativeCore.idr |  0
 .../adt/009 left-to-right/DerivedGen.idr      |  0
 .../adt/009 left-to-right/PrintDerivation.idr |  0
 .../adt/009 left-to-right/RunDerivedGen.idr   |  0
 .../print/adt/009 left-to-right/derive.ipkg   |  0
 .../print/adt/009 left-to-right/expected      |  0
 .../print/adt/009 left-to-right}/run          |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../010 right-to-left long-dpair/derive.ipkg  |  0
 .../adt/010 right-to-left long-dpair/expected |  0
 .../adt/010 right-to-left long-dpair}/run     |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../011 right-to-left long-dpair/derive.ipkg  |  0
 .../adt/011 right-to-left long-dpair/expected |  0
 .../adt/011 right-to-left long-dpair}/run     |  0
 .../AlternativeCore.idr                       |  0
 .../012 right-to-left chained/DerivedGen.idr  |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../adt/012 right-to-left chained/derive.ipkg |  0
 .../adt/012 right-to-left chained/expected    |  0
 .../print/adt/012 right-to-left chained}/run  |  0
 .../AlternativeCore.idr                       |  0
 .../013 right-to-left nondet/DerivedGen.idr   |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../adt/013 right-to-left nondet/derive.ipkg  |  0
 .../adt/013 right-to-left nondet/expected     |  0
 .../print/adt/013 right-to-left nondet}/run   |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../014 right-to-left nondet ext/derive.ipkg  |  0
 .../adt/014 right-to-left nondet ext/expected |  0
 .../adt/014 right-to-left nondet ext}/run     |  0
 .../derivation/least-effort/print/adt/_common |  0
 .../print/gadt/001 gadt/AlternativeCore.idr   |  0
 .../print/gadt/001 gadt/DerivedGen.idr        |  0
 .../print/gadt/001 gadt/PrintDerivation.idr   |  0
 .../print/gadt/001 gadt/RunDerivedGen.idr     |  0
 .../print/gadt/001 gadt/derive.ipkg           |  0
 .../least-effort/print/gadt/001 gadt/expected |  0
 .../least-effort/print/gadt/001 gadt}/run     |  0
 .../print/gadt/002 gadt/AlternativeCore.idr   |  0
 .../print/gadt/002 gadt/DerivedGen.idr        |  0
 .../print/gadt/002 gadt/PrintDerivation.idr   |  0
 .../print/gadt/002 gadt/RunDerivedGen.idr     |  0
 .../print/gadt/002 gadt/derive.ipkg           |  0
 .../least-effort/print/gadt/002 gadt/expected |  0
 .../least-effort/print/gadt/002 gadt}/run     |  0
 .../AlternativeCore.idr                       |  0
 .../003 right-to-left nondet/DerivedGen.idr   |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../gadt/003 right-to-left nondet/derive.ipkg |  0
 .../gadt/003 right-to-left nondet/expected    |  0
 .../print/gadt/003 right-to-left nondet}/run  |  0
 .../004 right-to-left det/AlternativeCore.idr |  0
 .../gadt/004 right-to-left det/DerivedGen.idr |  0
 .../004 right-to-left det/PrintDerivation.idr |  0
 .../004 right-to-left det/RunDerivedGen.idr   |  0
 .../gadt/004 right-to-left det/derive.ipkg    |  0
 .../print/gadt/004 right-to-left det/expected |  0
 .../print/gadt/004 right-to-left det}/run     |  0
 .../print/gadt/005 gadt/AlternativeCore.idr   |  0
 .../print/gadt/005 gadt/DerivedGen.idr        |  0
 .../print/gadt/005 gadt/PrintDerivation.idr   |  0
 .../print/gadt/005 gadt/RunDerivedGen.idr     |  0
 .../print/gadt/005 gadt/derive.ipkg           |  0
 .../least-effort/print/gadt/005 gadt/expected |  0
 .../least-effort/print/gadt/005 gadt}/run     |  0
 .../print/gadt/006 gadt/AlternativeCore.idr   |  0
 .../print/gadt/006 gadt/DerivedGen.idr        |  0
 .../print/gadt/006 gadt/PrintDerivation.idr   |  0
 .../print/gadt/006 gadt/RunDerivedGen.idr     |  0
 .../print/gadt/006 gadt/derive.ipkg           |  0
 .../least-effort/print/gadt/006 gadt/expected |  0
 .../least-effort/print/gadt/006 gadt}/run     |  0
 .../print/gadt/007 eq-n/AlternativeCore.idr   |  0
 .../print/gadt/007 eq-n/DerivedGen.idr        |  0
 .../print/gadt/007 eq-n/PrintDerivation.idr   |  0
 .../print/gadt/007 eq-n/RunDerivedGen.idr     |  0
 .../print/gadt/007 eq-n/derive.ipkg           |  0
 .../least-effort/print/gadt/007 eq-n/expected |  0
 .../least-effort/print/gadt/007 eq-n}/run     |  0
 .../print/gadt/008 eq-n/AlternativeCore.idr   |  0
 .../print/gadt/008 eq-n/DerivedGen.idr        |  0
 .../print/gadt/008 eq-n/PrintDerivation.idr   |  0
 .../print/gadt/008 eq-n/RunDerivedGen.idr     |  0
 .../print/gadt/008 eq-n/derive.ipkg           |  0
 .../least-effort/print/gadt/008 eq-n/expected |  0
 .../least-effort/print/gadt/008 eq-n}/run     |  0
 .../print/gadt/009 eq-n/AlternativeCore.idr   |  0
 .../print/gadt/009 eq-n/DerivedGen.idr        |  0
 .../print/gadt/009 eq-n/PrintDerivation.idr   |  0
 .../print/gadt/009 eq-n/RunDerivedGen.idr     |  0
 .../print/gadt/009 eq-n/derive.ipkg           |  0
 .../least-effort/print/gadt/009 eq-n/expected |  0
 .../least-effort/print/gadt/009 eq-n}/run     |  0
 .../print/gadt/010 eq-n/AlternativeCore.idr   |  0
 .../print/gadt/010 eq-n/DerivedGen.idr        |  0
 .../print/gadt/010 eq-n/PrintDerivation.idr   |  0
 .../print/gadt/010 eq-n/RunDerivedGen.idr     |  0
 .../print/gadt/010 eq-n/derive.ipkg           |  0
 .../least-effort/print/gadt/010 eq-n/expected |  0
 .../least-effort/print/gadt/010 eq-n}/run     |  0
 .../gadt/011 eq deepcons/AlternativeCore.idr  |  0
 .../print/gadt/011 eq deepcons/DerivedGen.idr |  0
 .../gadt/011 eq deepcons/PrintDerivation.idr  |  0
 .../gadt/011 eq deepcons/RunDerivedGen.idr    |  0
 .../print/gadt/011 eq deepcons/derive.ipkg    |  0
 .../print/gadt/011 eq deepcons/expected       |  0
 .../print/gadt/011 eq deepcons}/run           |  0
 .../gadt/012 eq deepcons/AlternativeCore.idr  |  0
 .../print/gadt/012 eq deepcons/DerivedGen.idr |  0
 .../gadt/012 eq deepcons/PrintDerivation.idr  |  0
 .../gadt/012 eq deepcons/RunDerivedGen.idr    |  0
 .../print/gadt/012 eq deepcons/derive.ipkg    |  0
 .../print/gadt/012 eq deepcons/expected       |  0
 .../print/gadt/012 eq deepcons}/run           |  0
 .../gadt/013 eq deepcons/AlternativeCore.idr  |  0
 .../print/gadt/013 eq deepcons/DerivedGen.idr |  0
 .../gadt/013 eq deepcons/PrintDerivation.idr  |  0
 .../gadt/013 eq deepcons/RunDerivedGen.idr    |  0
 .../print/gadt/013 eq deepcons/derive.ipkg    |  0
 .../print/gadt/013 eq deepcons/expected       |  0
 .../print/gadt/013 eq deepcons}/run           |  0
 .../gadt/014 eq deepcons/AlternativeCore.idr  |  0
 .../print/gadt/014 eq deepcons/DerivedGen.idr |  0
 .../gadt/014 eq deepcons/PrintDerivation.idr  |  0
 .../gadt/014 eq deepcons/RunDerivedGen.idr    |  0
 .../print/gadt/014 eq deepcons/derive.ipkg    |  0
 .../print/gadt/014 eq deepcons/expected       |  0
 .../print/gadt/014 eq deepcons}/run           |  0
 .../least-effort/print/gadt/_common           |  0
 .../least-effort/print/regression/_common     |  0
 .../dependent-givens-big/AlternativeCore.idr  |  0
 .../dependent-givens-big/DerivedGen.idr       |  0
 .../dependent-givens-big/PrintDerivation.idr  |  0
 .../dependent-givens-big/RunDerivedGen.idr    |  0
 .../dependent-givens-big/derive.ipkg          |  0
 .../regression/dependent-givens-big/expected  |  0
 .../regression/dependent-givens-big}/run      |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../dependent-givens-small-deep/derive.ipkg   |  0
 .../dependent-givens-small-deep/expected      |  0
 .../dependent-givens-small-deep}/run          |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../dependent-givens-small-shallow/expected   |  0
 .../dependent-givens-small-shallow}/run       |  0
 .../AlternativeCore.idr                       |  0
 .../lost-deceq-four-occurences/DerivedGen.idr |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../lost-deceq-four-occurences/derive.ipkg    |  0
 .../lost-deceq-four-occurences/expected       |  0
 .../lost-deceq-four-occurences}/run           |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../lost-deceq-three-occurences/derive.ipkg   |  0
 .../lost-deceq-three-occurences/expected      |  0
 .../lost-deceq-three-occurences}/run          |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../expected                                  |  0
 .../too-early-rename-multiple-complex}/run    |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../too-early-rename-multiple-simple/expected |  0
 .../too-early-rename-multiple-simple}/run     |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../expected                                  |  0
 .../too-early-rename-single-dependency}/run   |  0
 .../AlternativeCore.idr                       |  0
 .../DerivedGen.idr                            |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../unification-mismatch-dependent/expected   |  0
 .../unification-mismatch-dependent}/run       |  0
 .../AlternativeCore.idr                       |  0
 .../unification-name-mismatch/DerivedGen.idr  |  0
 .../PrintDerivation.idr                       |  0
 .../RunDerivedGen.idr                         |  0
 .../unification-name-mismatch/derive.ipkg     |  0
 .../unification-name-mismatch/expected        |  0
 .../regression/unification-name-mismatch}/run |  0
 .../run/adt/001 trivial/DerivedGen.idr        |  0
 .../run/adt/001 trivial/RunDerivedGen.idr     |  0
 .../run/adt/001 trivial/derive.ipkg           |  0
 .../least-effort/run/adt/001 trivial/expected |  0
 .../least-effort/run/adt/001 trivial}/run     |  0
 .../run/adt/002 noparam/DerivedGen.idr        |  0
 .../run/adt/002 noparam/RunDerivedGen.idr     |  0
 .../run/adt/002 noparam/derive.ipkg           |  0
 .../least-effort/run/adt/002 noparam/expected |  0
 .../least-effort/run/adt/002 noparam}/run     |  0
 .../run/adt/003 noparam/DerivedGen.idr        |  0
 .../run/adt/003 noparam/RunDerivedGen.idr     |  0
 .../run/adt/003 noparam/derive.ipkg           |  0
 .../least-effort/run/adt/003 noparam/expected |  0
 .../least-effort/run/adt/003 noparam}/run     |  0
 .../run/adt/004 noparam/DerivedGen.idr        |  0
 .../run/adt/004 noparam/RunDerivedGen.idr     |  0
 .../run/adt/004 noparam/derive.ipkg           |  0
 .../least-effort/run/adt/004 noparam/expected |  0
 .../least-effort/run/adt/004 noparam}/run     |  0
 .../run/adt/005 param/DerivedGen.idr          |  0
 .../run/adt/005 param/RunDerivedGen.idr       |  0
 .../run/adt/005 param/derive.ipkg             |  0
 .../least-effort/run/adt/005 param/expected   |  0
 .../least-effort/run/adt/005 param}/run       |  0
 .../run/adt/006 param/DerivedGen.idr          |  0
 .../run/adt/006 param/RunDerivedGen.idr       |  0
 .../run/adt/006 param/derive.ipkg             |  0
 .../least-effort/run/adt/006 param/expected   |  0
 .../least-effort/run/adt/006 param}/run       |  0
 .../007 right-to-left simple/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../adt/007 right-to-left simple/derive.ipkg  |  0
 .../run/adt/007 right-to-left simple/expected |  0
 .../run/adt/007 right-to-left simple}/run     |  0
 .../008 right-to-left simple/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../adt/008 right-to-left simple/derive.ipkg  |  0
 .../run/adt/008 right-to-left simple/expected |  0
 .../run/adt/008 right-to-left simple}/run     |  0
 .../run/adt/009 left-to-right/DerivedGen.idr  |  0
 .../adt/009 left-to-right/RunDerivedGen.idr   |  0
 .../run/adt/009 left-to-right/derive.ipkg     |  0
 .../run/adt/009 left-to-right/expected        |  0
 .../run/adt/009 left-to-right}/run            |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../010 right-to-left long-dpair/derive.ipkg  |  0
 .../adt/010 right-to-left long-dpair/expected |  0
 .../run/adt/010 right-to-left long-dpair}/run |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../011 right-to-left long-dpair/derive.ipkg  |  0
 .../adt/011 right-to-left long-dpair/expected |  0
 .../run/adt/011 right-to-left long-dpair}/run |  0
 .../012 right-to-left chained/DerivedGen.idr  |  0
 .../RunDerivedGen.idr                         |  0
 .../adt/012 right-to-left chained/derive.ipkg |  0
 .../adt/012 right-to-left chained/expected    |  0
 .../run/adt/012 right-to-left chained}/run    |  0
 .../013 right-to-left nondet/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../adt/013 right-to-left nondet/derive.ipkg  |  0
 .../run/adt/013 right-to-left nondet/expected |  0
 .../run/adt/013 right-to-left nondet}/run     |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../014 right-to-left nondet ext/derive.ipkg  |  0
 .../adt/014 right-to-left nondet ext/expected |  0
 .../run/adt/014 right-to-left nondet ext}/run |  0
 .../derivation/least-effort/run/adt/_common   |  0
 .../run/gadt/001 gadt/DerivedGen.idr          |  0
 .../run/gadt/001 gadt/RunDerivedGen.idr       |  0
 .../run/gadt/001 gadt/derive.ipkg             |  0
 .../least-effort/run/gadt/001 gadt/expected   |  0
 .../least-effort/run/gadt/001 gadt}/run       |  0
 .../run/gadt/002 gadt/DerivedGen.idr          |  0
 .../run/gadt/002 gadt/RunDerivedGen.idr       |  0
 .../run/gadt/002 gadt/derive.ipkg             |  0
 .../least-effort/run/gadt/002 gadt/expected   |  0
 .../least-effort/run/gadt/002 gadt}/run       |  0
 .../003 right-to-left nondet/DerivedGen.idr   |  0
 .../RunDerivedGen.idr                         |  0
 .../gadt/003 right-to-left nondet/derive.ipkg |  0
 .../gadt/003 right-to-left nondet/expected    |  0
 .../run/gadt/003 right-to-left nondet}/run    |  0
 .../gadt/004 right-to-left det/DerivedGen.idr |  0
 .../004 right-to-left det/RunDerivedGen.idr   |  0
 .../gadt/004 right-to-left det/derive.ipkg    |  0
 .../run/gadt/004 right-to-left det/expected   |  0
 .../run/gadt/004 right-to-left det}/run       |  0
 .../run/gadt/005 gadt/DerivedGen.idr          |  0
 .../run/gadt/005 gadt/RunDerivedGen.idr       |  0
 .../run/gadt/005 gadt/derive.ipkg             |  0
 .../least-effort/run/gadt/005 gadt/expected   |  0
 .../least-effort/run/gadt/005 gadt}/run       |  0
 .../run/gadt/006 gadt/DerivedGen.idr          |  0
 .../run/gadt/006 gadt/RunDerivedGen.idr       |  0
 .../run/gadt/006 gadt/derive.ipkg             |  0
 .../least-effort/run/gadt/006 gadt/expected   |  0
 .../least-effort/run/gadt/006 gadt}/run       |  0
 .../run/gadt/007 eq-n/DerivedGen.idr          |  0
 .../run/gadt/007 eq-n/RunDerivedGen.idr       |  0
 .../run/gadt/007 eq-n/derive.ipkg             |  0
 .../least-effort/run/gadt/007 eq-n/expected   |  0
 .../least-effort/run/gadt/007 eq-n}/run       |  0
 .../run/gadt/008 eq-n/DerivedGen.idr          |  0
 .../run/gadt/008 eq-n/RunDerivedGen.idr       |  0
 .../run/gadt/008 eq-n/derive.ipkg             |  0
 .../least-effort/run/gadt/008 eq-n/expected   |  0
 .../least-effort/run/gadt/008 eq-n}/run       |  0
 .../run/gadt/009 eq-n/DerivedGen.idr          |  0
 .../run/gadt/009 eq-n/RunDerivedGen.idr       |  0
 .../run/gadt/009 eq-n/derive.ipkg             |  0
 .../least-effort/run/gadt/009 eq-n/expected   |  0
 .../least-effort/run/gadt/009 eq-n}/run       |  0
 .../run/gadt/010 eq-n/DerivedGen.idr          |  0
 .../run/gadt/010 eq-n/RunDerivedGen.idr       |  0
 .../run/gadt/010 eq-n/derive.ipkg             |  0
 .../least-effort/run/gadt/010 eq-n/expected   |  0
 .../least-effort/run/gadt/010 eq-n}/run       |  0
 .../run/gadt/011 eq deepcons/DerivedGen.idr   |  0
 .../gadt/011 eq deepcons/RunDerivedGen.idr    |  0
 .../run/gadt/011 eq deepcons/derive.ipkg      |  0
 .../run/gadt/011 eq deepcons/expected         |  0
 .../run/gadt/011 eq deepcons}/run             |  0
 .../run/gadt/012 eq deepcons/DerivedGen.idr   |  0
 .../gadt/012 eq deepcons/RunDerivedGen.idr    |  0
 .../run/gadt/012 eq deepcons/derive.ipkg      |  0
 .../run/gadt/012 eq deepcons/expected         |  0
 .../run/gadt/012 eq deepcons}/run             |  0
 .../run/gadt/013 eq deepcons/DerivedGen.idr   |  0
 .../gadt/013 eq deepcons/RunDerivedGen.idr    |  0
 .../run/gadt/013 eq deepcons/derive.ipkg      |  0
 .../run/gadt/013 eq deepcons/expected         |  0
 .../run/gadt/013 eq deepcons}/run             |  0
 .../run/gadt/014 eq deepcons/DerivedGen.idr   |  0
 .../gadt/014 eq deepcons/RunDerivedGen.idr    |  0
 .../run/gadt/014 eq deepcons/derive.ipkg      |  0
 .../run/gadt/014 eq deepcons/expected         |  0
 .../run/gadt/014 eq deepcons}/run             |  0
 .../derivation/least-effort/run/gadt/_common  |  0
 .../least-effort/run/regression/_common       |  0
 .../dependent-givens-big/DerivedGen.idr       |  0
 .../dependent-givens-big/RunDerivedGen.idr    |  0
 .../dependent-givens-big/derive.ipkg          |  0
 .../regression/dependent-givens-big/expected  |  0
 .../run/regression/dependent-givens-big}/run  |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../dependent-givens-small-deep/derive.ipkg   |  0
 .../dependent-givens-small-deep/expected      |  0
 .../dependent-givens-small-deep}/run          |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../dependent-givens-small-shallow/expected   |  0
 .../dependent-givens-small-shallow}/run       |  0
 .../lost-deceq-four-occurences/DerivedGen.idr |  0
 .../RunDerivedGen.idr                         |  0
 .../lost-deceq-four-occurences/derive.ipkg    |  0
 .../lost-deceq-four-occurences/expected       |  0
 .../lost-deceq-four-occurences}/run           |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../lost-deceq-three-occurences/derive.ipkg   |  0
 .../lost-deceq-three-occurences/expected      |  0
 .../lost-deceq-three-occurences}/run          |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../expected                                  |  0
 .../too-early-rename-multiple-complex}/run    |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../too-early-rename-multiple-simple/expected |  0
 .../too-early-rename-multiple-simple}/run     |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../expected                                  |  0
 .../too-early-rename-single-dependency}/run   |  0
 .../DerivedGen.idr                            |  0
 .../RunDerivedGen.idr                         |  0
 .../derive.ipkg                               |  0
 .../unification-mismatch-dependent/expected   |  0
 .../unification-mismatch-dependent}/run       |  0
 .../unification-name-mismatch/DerivedGen.idr  |  0
 .../RunDerivedGen.idr                         |  0
 .../unification-name-mismatch/derive.ipkg     |  0
 .../unification-name-mismatch/expected        |  0
 .../regression/unification-name-mismatch}/run |  0
 .../utils}/arg-deps/_common/Infra.idr         |  0
 .../utils}/arg-deps/_common/arg-deps.ipkg     |  0
 .../utils}/arg-deps/_common/run               |  0
 .../arg-deps/deps-001-simple/DepsCheck.idr    |  0
 .../utils}/arg-deps/deps-001-simple/Infra.idr |  0
 .../arg-deps/deps-001-simple/arg-deps.ipkg    |  0
 .../utils}/arg-deps/deps-001-simple/expected  |  0
 .../utils/arg-deps/deps-001-simple}/run       |  0
 .../deps-002-longer-transitive/DepsCheck.idr  |  0
 .../deps-002-longer-transitive/Infra.idr      |  0
 .../deps-002-longer-transitive/arg-deps.ipkg  |  0
 .../deps-002-longer-transitive/expected       |  0
 .../arg-deps/deps-002-longer-transitive}/run  |  0
 .../deps-003-lambda-shadowing/DepsCheck.idr   |  0
 .../deps-003-lambda-shadowing/Infra.idr       |  0
 .../deps-003-lambda-shadowing/arg-deps.ipkg   |  0
 .../deps-003-lambda-shadowing}/dont-run       |  0
 .../deps-003-lambda-shadowing/expected        |  0
 .../arg-deps/deps-004-case/DepsCheck.idr      |  0
 .../utils}/arg-deps/deps-004-case/Infra.idr   |  0
 .../arg-deps/deps-004-case/arg-deps.ipkg      |  0
 .../utils/arg-deps/deps-004-case}/dont-run    |  0
 .../utils}/arg-deps/deps-004-case/expected    |  0
 .../utils}/canonicsig/_common/Infra.idr       |  0
 .../canonicsig/_common/canonic-sig.ipkg       |  0
 .../utils}/canonicsig/_common/run             |  0
 .../canonicsig/dep-params/CanonicSigCheck.idr |  0
 .../utils}/canonicsig/dep-params/Infra.idr    |  0
 .../canonicsig/dep-params/canonic-sig.ipkg    |  0
 .../utils}/canonicsig/dep-params/expected     |  0
 .../utils/canonicsig/dep-params}/run          |  0
 .../nondep-expl-params/CanonicSigCheck.idr    |  0
 .../canonicsig/nondep-expl-params/Infra.idr   |  0
 .../nondep-expl-params/canonic-sig.ipkg       |  0
 .../canonicsig/nondep-expl-params/expected    |  0
 .../utils/canonicsig/nondep-expl-params}/run  |  0
 .../nondep-mixed-params/CanonicSigCheck.idr   |  0
 .../canonicsig/nondep-mixed-params/Infra.idr  |  0
 .../nondep-mixed-params/canonic-sig.ipkg      |  0
 .../canonicsig/nondep-mixed-params/expected   |  0
 .../utils/canonicsig/nondep-mixed-params}/run |  0
 .../canonicsig/trivial/CanonicSigCheck.idr    |  0
 .../utils}/canonicsig/trivial/Infra.idr       |  0
 .../canonicsig/trivial/canonic-sig.ipkg       |  0
 .../utils}/canonicsig/trivial/expected        |  0
 .../utils/canonicsig/trivial}/run             |  0
 .../_common-deep-cons-app/Infra.idr           |  0
 .../_common-deep-cons-app/cons.ipkg           |  0
 .../cons-analysis/_common-deep-cons-app/run   |  0
 .../deep-cons-app-001/ConsApps.idr            |  0
 .../cons-analysis/deep-cons-app-001/Infra.idr |  0
 .../cons-analysis/deep-cons-app-001/cons.ipkg |  0
 .../cons-analysis/deep-cons-app-001/expected  |  0
 .../cons-analysis/deep-cons-app-001/run       |  0
 .../deep-cons-app-002-neg/ConsApps.idr        |  0
 .../deep-cons-app-002-neg/Infra.idr           |  0
 .../deep-cons-app-002-neg/cons.ipkg           |  0
 .../deep-cons-app-002-neg/expected            |  0
 .../cons-analysis/deep-cons-app-002-neg/run   |  0
 .../deep-cons-app-003/ConsApps.idr            |  0
 .../cons-analysis/deep-cons-app-003/Infra.idr |  0
 .../cons-analysis/deep-cons-app-003/cons.ipkg |  0
 .../cons-analysis/deep-cons-app-003/expected  |  0
 .../cons-analysis/deep-cons-app-003/run       |  0
 .../deep-cons-app-004/ConsApps.idr            |  0
 .../cons-analysis/deep-cons-app-004/Infra.idr |  0
 .../cons-analysis/deep-cons-app-004/cons.ipkg |  0
 .../cons-analysis/deep-cons-app-004/expected  |  0
 .../cons-analysis/deep-cons-app-004/run       |  0
 .../deep-cons-app-005-neg/ConsApps.idr        |  0
 .../deep-cons-app-005-neg/Infra.idr           |  0
 .../deep-cons-app-005-neg/cons.ipkg           |  0
 .../deep-cons-app-005-neg/expected            |  0
 .../cons-analysis/deep-cons-app-005-neg/run   |  0
 .../deep-cons-app-006/ConsApps.idr            |  0
 .../cons-analysis/deep-cons-app-006/Infra.idr |  0
 .../cons-analysis/deep-cons-app-006/cons.ipkg |  0
 .../cons-analysis/deep-cons-app-006/expected  |  0
 .../cons-analysis/deep-cons-app-006/run       |  0
 .../up-to-renaming-ttimp-eq/_common/Infra.idr |  0
 .../_common/renaming-ttimp-eq.ipkg            |  0
 .../up-to-renaming-ttimp-eq/_common/run       |  0
 .../renaming/Infra.idr                        |  0
 .../renaming/RenamingTTImpEqCheck.idr         |  0
 .../up-to-renaming-ttimp-eq/renaming/expected |  0
 .../renaming/renaming-ttimp-eq.ipkg           |  0
 .../up-to-renaming-ttimp-eq/renaming/run      |  0
 .../up-to-renaming-ttimp-eq/simple/Infra.idr  |  0
 .../simple/RenamingTTImpEqCheck.idr           |  0
 .../up-to-renaming-ttimp-eq/simple/expected   |  0
 .../simple/renaming-ttimp-eq.ipkg             |  0
 .../utils}/up-to-renaming-ttimp-eq/simple/run |  0
 .../derivation/distribution/_common           |  1 -
 tests/runner/Runner.idr                       | 18 +++++------
 1342 files changed, 28 insertions(+), 28 deletions(-)
 rename tests/{gen-derivation => }/derivation/_common/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/_common/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/_common/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/_common/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/_common/run (100%)
 rename tests/{gen-derivation => }/derivation/core/_common (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 001/expected (100%)
 rename tests/{gen-derivation/arg-deps/deps-001-simple => derivation/core/norec nodep noext 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 002/expected (100%)
 rename tests/{gen-derivation/arg-deps/deps-002-longer-transitive => derivation/core/norec nodep noext 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 003-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 003-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 003-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 003-neg/expected (100%)
 rename tests/{gen-derivation/canonicsig/dep-params => derivation/core/norec nodep noext 003-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 004-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 004-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 004-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 004-neg/expected (100%)
 rename tests/{gen-derivation/canonicsig/nondep-expl-params => derivation/core/norec nodep noext 004-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 005-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 005-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 005-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep noext 005-neg/expected (100%)
 rename tests/{gen-derivation/canonicsig/nondep-mixed-params => derivation/core/norec nodep noext 005-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 001/expected (100%)
 rename tests/{gen-derivation/canonicsig/trivial => derivation/core/norec nodep w_ext 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep noext 001 => derivation/core/norec nodep w_ext 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 003/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep noext 002 => derivation/core/norec nodep w_ext 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 004/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep noext 003-neg => derivation/core/norec nodep w_ext 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 005/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep noext 004-neg => derivation/core/norec nodep w_ext 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 006/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 006/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 006/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 006/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep noext 005-neg => derivation/core/norec nodep w_ext 006}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 007/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 007/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 007/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec nodep w_ext 007/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep w_ext 001 => derivation/core/norec nodep w_ext 007}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 001-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 001-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 001-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 001-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep w_ext 002 => derivation/core/norec part noext 001-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 002-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 002-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 002-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 002-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep w_ext 003 => derivation/core/norec part noext 002-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 003/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep w_ext 004 => derivation/core/norec part noext 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 004/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep w_ext 005 => derivation/core/norec part noext 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part noext 005/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep w_ext 006 => derivation/core/norec part noext 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 001/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec nodep w_ext 007 => derivation/core/norec part w_ext 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part noext 001-neg => derivation/core/norec part w_ext 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 003/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part noext 002-neg => derivation/core/norec part w_ext 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 004-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 004-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 004-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 004-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part noext 003 => derivation/core/norec part w_ext 004-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 005-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 005-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 005-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 005-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part noext 004 => derivation/core/norec part w_ext 005-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 006-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 006-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 006-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec part w_ext 006-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part noext 005 => derivation/core/norec part w_ext 006-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 001-shdw/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 001-shdw/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 001-shdw/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 001-shdw/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part w_ext 001 => derivation/core/norec t-..->p. noext 001-shdw}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 001/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part w_ext 002 => derivation/core/norec t-..->p. noext 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-..->p. noext 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part w_ext 003 => derivation/core/norec t-..->p. noext 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 001/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part w_ext 004-neg => derivation/core/norec t-p.->.. noext 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part w_ext 005-neg => derivation/core/norec t-p.->.. noext 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. noext 003/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec part w_ext 006-neg => derivation/core/norec t-p.->.. noext 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 001/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-..->p. noext 001-shdw => derivation/core/norec t-p.->.. w_ext 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-..->p. noext 001 => derivation/core/norec t-p.->.. w_ext 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 003-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 003-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 003-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 003-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-..->p. noext 002 => derivation/core/norec t-p.->.. w_ext 003-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 004-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 004-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 004-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 004-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. noext 001 => derivation/core/norec t-p.->.. w_ext 004-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 005/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. noext 002 => derivation/core/norec t-p.->.. w_ext 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 006/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 006/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 006/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-p.->.. w_ext 006/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. noext 003 => derivation/core/norec t-p.->.. w_ext 006}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 001/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. w_ext 001 => derivation/core/norec t-pi->.. noext 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. w_ext 002 => derivation/core/norec t-pi->.. noext 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 003/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg => derivation/core/norec t-pi->.. noext 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. noext 004/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg => derivation/core/norec t-pi->.. noext 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 001-shdw/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 001-shdw/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 001-shdw/derive.ipkg (100%)
 rename tests/{gen-derivation/arg-deps/deps-003-lambda-shadowing => derivation/core/norec t-pi->.. w_ext 001-shdw}/dont-run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 001-shdw/expected (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 001/derive.ipkg (100%)
 rename tests/{gen-derivation/arg-deps/deps-004-case => derivation/core/norec t-pi->.. w_ext 001}/dont-run (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 001/expected (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/norec t-pi->.. w_ext 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. w_ext 005 => derivation/core/norec t-pi->.. w_ext 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/tests-roadmap (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 001/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-p.->.. w_ext 006 => derivation/core/trivial 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 002-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 002-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 002-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 002-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-pi->.. noext 001 => derivation/core/trivial 002-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 003-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 003-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 003-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 003-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-pi->.. noext 002 => derivation/core/trivial 003-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 004-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 004-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 004-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/trivial 004-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-pi->.. noext 003 => derivation/core/trivial 004-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 001/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-pi->.. noext 004 => derivation/core/typealias con 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/norec t-pi->.. w_ext 002 => derivation/core/typealias con 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 003-neg/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 003-neg/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 003-neg/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/typealias con 003-neg/expected (100%)
 rename tests/{gen-derivation/derivation/core/trivial 001 => derivation/core/typealias con 003-neg}/run (100%)
 rename tests/{gen-derivation => }/derivation/core/upstream-2983/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/upstream-2983/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/core/upstream-2983/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/core/upstream-2983/expected (100%)
 rename tests/{gen-derivation/derivation/core/trivial 002-neg => derivation/core/upstream-2983}/run (100%)
 create mode 120000 tests/derivation/distribution/_common
 rename tests/{gen-derivation => }/derivation/distribution/list-nat-001/CheckDistribution.idr (100%)
 rename tests/{gen-derivation => }/derivation/distribution/list-nat-001/DistrCheckCommon.idr (100%)
 rename tests/{gen-derivation => }/derivation/distribution/list-nat-001/expected (100%)
 rename tests/{gen-derivation/derivation/core/trivial 003-neg => derivation/distribution/list-nat-001}/run (100%)
 rename tests/{gen-derivation => }/derivation/distribution/list-nat-001/test.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/distribution/list-nat-002/CheckDistribution.idr (100%)
 rename tests/{gen-derivation => }/derivation/distribution/list-nat-002/DistrCheckCommon.idr (100%)
 rename tests/{gen-derivation => }/derivation/distribution/list-nat-002/expected (100%)
 rename tests/{gen-derivation/derivation/core/trivial 004-neg => derivation/distribution/list-nat-002}/run (100%)
 rename tests/{gen-derivation => }/derivation/distribution/list-nat-002/test.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/distribution/nats-001/CheckDistribution.idr (100%)
 rename tests/{gen-derivation => }/derivation/distribution/nats-001/DistrCheckCommon.idr (100%)
 rename tests/{gen-derivation => }/derivation/distribution/nats-001/expected (100%)
 rename tests/{gen-derivation/derivation/core/typealias con 001 => derivation/distribution/nats-001}/run (100%)
 rename tests/{gen-derivation => }/derivation/distribution/nats-001/test.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/distribution/vect-nat-001/CheckDistribution.idr (100%)
 rename tests/{gen-derivation => }/derivation/distribution/vect-nat-001/DistrCheckCommon.idr (100%)
 rename tests/{gen-derivation => }/derivation/distribution/vect-nat-001/expected (100%)
 rename tests/{gen-derivation/derivation/core/typealias con 002 => derivation/distribution/vect-nat-001}/run (100%)
 rename tests/{gen-derivation => }/derivation/distribution/vect-nat-001/test.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/_common (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 001/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 001/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 001/expected (100%)
 rename tests/{gen-derivation/derivation/core/typealias con 003-neg => derivation/infra/empty-body print 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 002/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 002/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 002/expected (100%)
 rename tests/{gen-derivation/derivation/core/upstream-2983 => derivation/infra/empty-body print 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 003/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 003/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 003/expected (100%)
 rename tests/{gen-derivation/derivation/distribution/list-nat-001 => derivation/infra/empty-body print 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 004/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 004/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 004/expected (100%)
 rename tests/{gen-derivation/derivation/distribution/list-nat-002 => derivation/infra/empty-body print 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 005/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 005/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 005/expected (100%)
 rename tests/{gen-derivation/derivation/distribution/nats-001 => derivation/infra/empty-body print 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 006/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 006/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 006/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 006/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 006/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 006/expected (100%)
 rename tests/{gen-derivation/derivation/distribution/vect-nat-001 => derivation/infra/empty-body print 006}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 007/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 007/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 007/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 007/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 007/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 007/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body print 001 => derivation/infra/empty-body print 007}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 008/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 008/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 008/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 008/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 008/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body print 008/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body print 002 => derivation/infra/empty-body print 008}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 001/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 001/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body print 003 => derivation/infra/empty-body run 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 002/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 002/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body print 004 => derivation/infra/empty-body run 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 003/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 003/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body print 005 => derivation/infra/empty-body run 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 004/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 004/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body print 006 => derivation/infra/empty-body run 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 005/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 005/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body print 007 => derivation/infra/empty-body run 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 006/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 006/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 006/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 006/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 006/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body print 008 => derivation/infra/empty-body run 006}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 007/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 007/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 007/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 007/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 007/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 001 => derivation/infra/empty-body run 007}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 008/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 008/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 008/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 008/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 008/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 002 => derivation/infra/empty-body run 008}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 009/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 009/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 009/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 009/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 009/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 003 => derivation/infra/empty-body run 009}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 010/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 010/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 010/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 010/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-body run 010/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 004 => derivation/infra/empty-body run 010}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 001/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 001/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 001/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 005 => derivation/infra/empty-cons print 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 002/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 002/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 002/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 006 => derivation/infra/empty-cons print 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 003/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 003/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 003/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 007 => derivation/infra/empty-cons print 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 004/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 004/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 004/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 008 => derivation/infra/empty-cons print 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 005/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 005/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 005/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 009 => derivation/infra/empty-cons print 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 006/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 006/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 006/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 006/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 006/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 006/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-body run 010 => derivation/infra/empty-cons print 006}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 007/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 007/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 007/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 007/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 007/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 007/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 001 => derivation/infra/empty-cons print 007}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 008/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 008/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 008/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 008/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 008/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 008/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 002 => derivation/infra/empty-cons print 008}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 009/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 009/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 009/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 009/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 009/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 009/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 003 => derivation/infra/empty-cons print 009}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 010/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 010/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 010/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 010/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 010/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 010/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 004 => derivation/infra/empty-cons print 010}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 011/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 011/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 011/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 011/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 011/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 011/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 005 => derivation/infra/empty-cons print 011}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 012/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 012/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 012/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 012/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 012/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 012/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 006 => derivation/infra/empty-cons print 012}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 013/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 013/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 013/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 013/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 013/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 013/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 007 => derivation/infra/empty-cons print 013}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 014/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 014/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 014/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 014/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 014/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons print 014/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 008 => derivation/infra/empty-cons print 014}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 001/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 001/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 009 => derivation/infra/empty-cons run 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 002/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 002/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 010 => derivation/infra/empty-cons run 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 003/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 003/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 011 => derivation/infra/empty-cons run 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 004/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 004/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 012 => derivation/infra/empty-cons run 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 005/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 005/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 013 => derivation/infra/empty-cons run 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 006/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 006/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 006/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 006/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 006/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons print 014 => derivation/infra/empty-cons run 006}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 007/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 007/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 007/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 007/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 007/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 001 => derivation/infra/empty-cons run 007}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 008/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 008/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 008/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 008/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 008/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 002 => derivation/infra/empty-cons run 008}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 009/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 009/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 009/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 009/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 009/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 003 => derivation/infra/empty-cons run 009}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 010/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 010/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 010/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 010/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 010/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 004 => derivation/infra/empty-cons run 010}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 011/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 011/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 011/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 011/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 011/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 005 => derivation/infra/empty-cons run 011}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 012/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 012/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 012/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 012/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 012/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 006 => derivation/infra/empty-cons run 012}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 013/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 013/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 013/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 013/derive.ipkg (100%)
 rename tests/{gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw => derivation/infra/empty-cons run 013}/dont-run (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 013/expected (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 014/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 014/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 014/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 014/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/empty-cons run 014/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 007 => derivation/infra/empty-cons run 014}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 001/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 001/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 001/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 008 => derivation/infra/ext print 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 002/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 002/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 002/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 009 => derivation/infra/ext print 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 003/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 003/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 003/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 010 => derivation/infra/ext print 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 004/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 004/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext print 004/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 011 => derivation/infra/ext print 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 001/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 001/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 012 => derivation/infra/ext run 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 002/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 002/expected (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 014 => derivation/infra/ext run 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 003/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 003/expected (100%)
 rename tests/{gen-derivation/derivation/infra/ext print 001 => derivation/infra/ext run 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 004/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/ext run 004/expected (100%)
 rename tests/{gen-derivation/derivation/infra/ext print 002 => derivation/infra/ext run 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 001/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 001/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 001/expected (100%)
 rename tests/{gen-derivation/derivation/infra/ext print 003 => derivation/infra/self print 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 002/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 002/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 002/expected (100%)
 rename tests/{gen-derivation/derivation/infra/ext print 004 => derivation/infra/self print 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 003/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 003/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 003/expected (100%)
 rename tests/{gen-derivation/derivation/infra/ext run 001 => derivation/infra/self print 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 004/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 004/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 004/expected (100%)
 rename tests/{gen-derivation/derivation/infra/ext run 002 => derivation/infra/self print 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 005/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 005/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 005/expected (100%)
 rename tests/{gen-derivation/derivation/infra/ext run 003 => derivation/infra/self print 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 006/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 006/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 006/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 006/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 006/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 006/expected (100%)
 rename tests/{gen-derivation/derivation/infra/ext run 004 => derivation/infra/self print 006}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 007/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 007/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 007/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 007/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 007/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 007/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self print 001 => derivation/infra/self print 007}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 008/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 008/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 008/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 008/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 008/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self print 008/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self print 002 => derivation/infra/self print 008}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 001/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 001/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 001/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 001/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 001/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self print 003 => derivation/infra/self run 001}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 002/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 002/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 002/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 002/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 002/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self print 004 => derivation/infra/self run 002}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 003/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 003/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 003/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 003/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 003/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self print 005 => derivation/infra/self run 003}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 004/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 004/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 004/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 004/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 004/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self print 006 => derivation/infra/self run 004}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 005/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 005/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 005/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 005/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 005/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self print 007 => derivation/infra/self run 005}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 006/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 006/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 006/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 006/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 006/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self print 008 => derivation/infra/self run 006}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 007/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 007/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 007/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 007/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 007/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 001 => derivation/infra/self run 007}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 008/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 008/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 008/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 008/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 008/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 002 => derivation/infra/self run 008}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 009/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 009/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 009/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 009/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 009/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 003 => derivation/infra/self run 009}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 010/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 010/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 010/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 010/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/infra/self run 010/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 004 => derivation/infra/self run 010}/run (100%)
 rename tests/{gen-derivation => }/derivation/infra/tests-scheme (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/_common/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/_common/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-args-in-target-type/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-args-in-target-type/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 005 => derivation/inputvalidation/bad-args-in-target-type}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-args-in-target-type/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-fuel/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-fuel/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 006 => derivation/inputvalidation/bad-fuel}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-fuel/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-param-names/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-param-names/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 007 => derivation/inputvalidation/bad-param-names}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/bad-param-names/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/external-gens/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/external-gens/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 008 => derivation/inputvalidation/external-gens}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/external-gens/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/non-gen-target-type/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/non-gen-target-type/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 009 => derivation/inputvalidation/non-gen-target-type}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/non-gen-target-type/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/odd-or-lacking-gen-params/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/odd-or-lacking-gen-params/expected (100%)
 rename tests/{gen-derivation/derivation/infra/self run 010 => derivation/inputvalidation/odd-or-lacking-gen-params}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/odd-or-lacking-gen-params/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/unexpected-gen-target/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/unexpected-gen-target/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/001 trivial => derivation/inputvalidation/unexpected-gen-target}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/unexpected-gen-target/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/unexpected-multiplicity/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/unexpected-multiplicity/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/002 noparam => derivation/inputvalidation/unexpected-multiplicity}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/unexpected-multiplicity/validate-input.ipkg (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/wrong-params-order/ValidateInput.idr (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/wrong-params-order/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/003 noparam => derivation/inputvalidation/wrong-params-order}/run (100%)
 rename tests/{gen-derivation => derivation}/inputvalidation/wrong-params-order/validate-input.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/001 trivial/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/001 trivial/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/001 trivial/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/001 trivial/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/001 trivial/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/004 noparam => derivation/least-effort/print/adt/001 trivial}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/002 noparam/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/002 noparam/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/002 noparam/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/002 noparam/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/002 noparam/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/005 param => derivation/least-effort/print/adt/002 noparam}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/003 noparam/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/003 noparam/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/003 noparam/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/003 noparam/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/003 noparam/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/006 param => derivation/least-effort/print/adt/003 noparam}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/004 noparam/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/004 noparam/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/004 noparam/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/004 noparam/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/004 noparam/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple => derivation/least-effort/print/adt/004 noparam}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/005 param/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/005 param/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/005 param/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/005 param/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/005 param/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/005 param/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple => derivation/least-effort/print/adt/005 param}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/006 param/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/006 param/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/006 param/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/006 param/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/006 param/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/006 param/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/009 left-to-right => derivation/least-effort/print/adt/006 param}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/007 right-to-left simple/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/007 right-to-left simple/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/007 right-to-left simple/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/007 right-to-left simple/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/007 right-to-left simple/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair => derivation/least-effort/print/adt/007 right-to-left simple}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/008 right-to-left simple/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/008 right-to-left simple/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/008 right-to-left simple/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/008 right-to-left simple/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/008 right-to-left simple/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair => derivation/least-effort/print/adt/008 right-to-left simple}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/009 left-to-right/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/009 left-to-right/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/009 left-to-right/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/009 left-to-right/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/009 left-to-right/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained => derivation/least-effort/print/adt/009 left-to-right}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/010 right-to-left long-dpair/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/010 right-to-left long-dpair/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/010 right-to-left long-dpair/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/010 right-to-left long-dpair/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet => derivation/least-effort/print/adt/010 right-to-left long-dpair}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/011 right-to-left long-dpair/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/011 right-to-left long-dpair/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/011 right-to-left long-dpair/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/011 right-to-left long-dpair/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext => derivation/least-effort/print/adt/011 right-to-left long-dpair}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/012 right-to-left chained/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/012 right-to-left chained/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/012 right-to-left chained/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/012 right-to-left chained/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/012 right-to-left chained/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/001 gadt => derivation/least-effort/print/adt/012 right-to-left chained}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/013 right-to-left nondet/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/013 right-to-left nondet/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/013 right-to-left nondet/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/013 right-to-left nondet/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/013 right-to-left nondet/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/002 gadt => derivation/least-effort/print/adt/013 right-to-left nondet}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/014 right-to-left nondet ext/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/014 right-to-left nondet ext/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/014 right-to-left nondet ext/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/014 right-to-left nondet ext/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet => derivation/least-effort/print/adt/014 right-to-left nondet ext}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/adt/_common (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/001 gadt/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/001 gadt/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/001 gadt/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/001 gadt/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/001 gadt/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det => derivation/least-effort/print/gadt/001 gadt}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/002 gadt/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/002 gadt/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/002 gadt/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/002 gadt/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/002 gadt/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/005 gadt => derivation/least-effort/print/gadt/002 gadt}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/003 right-to-left nondet/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/003 right-to-left nondet/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/003 right-to-left nondet/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/003 right-to-left nondet/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/003 right-to-left nondet/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/006 gadt => derivation/least-effort/print/gadt/003 right-to-left nondet}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/004 right-to-left det/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/004 right-to-left det/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/004 right-to-left det/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/004 right-to-left det/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/004 right-to-left det/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/007 eq-n => derivation/least-effort/print/gadt/004 right-to-left det}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/005 gadt/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/005 gadt/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/005 gadt/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/005 gadt/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/005 gadt/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/008 eq-n => derivation/least-effort/print/gadt/005 gadt}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/006 gadt/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/006 gadt/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/006 gadt/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/006 gadt/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/006 gadt/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/009 eq-n => derivation/least-effort/print/gadt/006 gadt}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/007 eq-n/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/007 eq-n/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/007 eq-n/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/007 eq-n/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/007 eq-n/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/010 eq-n => derivation/least-effort/print/gadt/007 eq-n}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/008 eq-n/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/008 eq-n/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/008 eq-n/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/008 eq-n/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/008 eq-n/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons => derivation/least-effort/print/gadt/008 eq-n}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/009 eq-n/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/009 eq-n/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/009 eq-n/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/009 eq-n/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/009 eq-n/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons => derivation/least-effort/print/gadt/009 eq-n}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/010 eq-n/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/010 eq-n/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/010 eq-n/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/010 eq-n/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/010 eq-n/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons => derivation/least-effort/print/gadt/010 eq-n}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/011 eq deepcons/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/011 eq deepcons/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/011 eq deepcons/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/011 eq deepcons/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/011 eq deepcons/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons => derivation/least-effort/print/gadt/011 eq deepcons}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/012 eq deepcons/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/012 eq deepcons/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/012 eq deepcons/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/012 eq deepcons/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/012 eq deepcons/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/dependent-givens-big => derivation/least-effort/print/gadt/012 eq deepcons}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/013 eq deepcons/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/013 eq deepcons/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/013 eq deepcons/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/013 eq deepcons/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/013 eq deepcons/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep => derivation/least-effort/print/gadt/013 eq deepcons}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/014 eq deepcons/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/014 eq deepcons/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/014 eq deepcons/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/014 eq deepcons/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/014 eq deepcons/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow => derivation/least-effort/print/gadt/014 eq deepcons}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/gadt/_common (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/_common (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-big/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-big/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-big/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-big/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-big/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences => derivation/least-effort/print/regression/dependent-givens-big}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-deep/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-deep/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-deep/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-deep/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-deep/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences => derivation/least-effort/print/regression/dependent-givens-small-deep}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-shallow/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-shallow/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-shallow/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-shallow/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex => derivation/least-effort/print/regression/dependent-givens-small-shallow}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-four-occurences/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-four-occurences/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-four-occurences/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-four-occurences/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple => derivation/least-effort/print/regression/lost-deceq-four-occurences}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-three-occurences/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-three-occurences/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-three-occurences/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-three-occurences/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency => derivation/least-effort/print/regression/lost-deceq-three-occurences}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-complex/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-complex/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-complex/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-complex/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent => derivation/least-effort/print/regression/too-early-rename-multiple-complex}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-simple/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-simple/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-simple/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-simple/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch => derivation/least-effort/print/regression/too-early-rename-multiple-simple}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-single-dependency/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-single-dependency/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-single-dependency/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-single-dependency/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/001 trivial => derivation/least-effort/print/regression/too-early-rename-single-dependency}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-mismatch-dependent/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-mismatch-dependent/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-mismatch-dependent/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-mismatch-dependent/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-mismatch-dependent/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/002 noparam => derivation/least-effort/print/regression/unification-mismatch-dependent}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-name-mismatch/AlternativeCore.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-name-mismatch/PrintDerivation.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-name-mismatch/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-name-mismatch/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/print/regression/unification-name-mismatch/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/003 noparam => derivation/least-effort/print/regression/unification-name-mismatch}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/001 trivial/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/001 trivial/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/001 trivial/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/001 trivial/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/004 noparam => derivation/least-effort/run/adt/001 trivial}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/002 noparam/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/002 noparam/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/002 noparam/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/002 noparam/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/005 param => derivation/least-effort/run/adt/002 noparam}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/003 noparam/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/003 noparam/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/003 noparam/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/003 noparam/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/006 param => derivation/least-effort/run/adt/003 noparam}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/004 noparam/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/004 noparam/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/004 noparam/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/004 noparam/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple => derivation/least-effort/run/adt/004 noparam}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/005 param/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/005 param/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/005 param/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/005 param/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple => derivation/least-effort/run/adt/005 param}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/006 param/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/006 param/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/006 param/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/006 param/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/009 left-to-right => derivation/least-effort/run/adt/006 param}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/007 right-to-left simple/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/007 right-to-left simple/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/007 right-to-left simple/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/007 right-to-left simple/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair => derivation/least-effort/run/adt/007 right-to-left simple}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/008 right-to-left simple/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/008 right-to-left simple/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/008 right-to-left simple/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/008 right-to-left simple/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair => derivation/least-effort/run/adt/008 right-to-left simple}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/009 left-to-right/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/009 left-to-right/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/009 left-to-right/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/009 left-to-right/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained => derivation/least-effort/run/adt/009 left-to-right}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/010 right-to-left long-dpair/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/010 right-to-left long-dpair/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/010 right-to-left long-dpair/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/010 right-to-left long-dpair/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet => derivation/least-effort/run/adt/010 right-to-left long-dpair}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/011 right-to-left long-dpair/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/011 right-to-left long-dpair/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/011 right-to-left long-dpair/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/011 right-to-left long-dpair/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext => derivation/least-effort/run/adt/011 right-to-left long-dpair}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/012 right-to-left chained/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/012 right-to-left chained/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/012 right-to-left chained/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/012 right-to-left chained/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/001 gadt => derivation/least-effort/run/adt/012 right-to-left chained}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/013 right-to-left nondet/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/013 right-to-left nondet/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/013 right-to-left nondet/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/013 right-to-left nondet/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/002 gadt => derivation/least-effort/run/adt/013 right-to-left nondet}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/014 right-to-left nondet ext/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/014 right-to-left nondet ext/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/014 right-to-left nondet ext/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/014 right-to-left nondet ext/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet => derivation/least-effort/run/adt/014 right-to-left nondet ext}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/adt/_common (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/001 gadt/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/001 gadt/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/001 gadt/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/001 gadt/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det => derivation/least-effort/run/gadt/001 gadt}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/002 gadt/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/002 gadt/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/002 gadt/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/002 gadt/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/005 gadt => derivation/least-effort/run/gadt/002 gadt}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/003 right-to-left nondet/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/003 right-to-left nondet/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/003 right-to-left nondet/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/003 right-to-left nondet/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/006 gadt => derivation/least-effort/run/gadt/003 right-to-left nondet}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/004 right-to-left det/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/004 right-to-left det/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/004 right-to-left det/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/004 right-to-left det/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/007 eq-n => derivation/least-effort/run/gadt/004 right-to-left det}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/005 gadt/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/005 gadt/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/005 gadt/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/005 gadt/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/008 eq-n => derivation/least-effort/run/gadt/005 gadt}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/006 gadt/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/006 gadt/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/006 gadt/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/006 gadt/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/009 eq-n => derivation/least-effort/run/gadt/006 gadt}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/007 eq-n/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/007 eq-n/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/007 eq-n/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/007 eq-n/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/010 eq-n => derivation/least-effort/run/gadt/007 eq-n}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/008 eq-n/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/008 eq-n/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/008 eq-n/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/008 eq-n/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons => derivation/least-effort/run/gadt/008 eq-n}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/009 eq-n/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/009 eq-n/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/009 eq-n/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/009 eq-n/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons => derivation/least-effort/run/gadt/009 eq-n}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/010 eq-n/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/010 eq-n/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/010 eq-n/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/010 eq-n/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons => derivation/least-effort/run/gadt/010 eq-n}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/011 eq deepcons/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/011 eq deepcons/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/011 eq deepcons/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/011 eq deepcons/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons => derivation/least-effort/run/gadt/011 eq deepcons}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/012 eq deepcons/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/012 eq deepcons/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/012 eq deepcons/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/012 eq deepcons/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/dependent-givens-big => derivation/least-effort/run/gadt/012 eq deepcons}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/013 eq deepcons/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/013 eq deepcons/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/013 eq deepcons/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/013 eq deepcons/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep => derivation/least-effort/run/gadt/013 eq deepcons}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/014 eq deepcons/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/014 eq deepcons/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/014 eq deepcons/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/014 eq deepcons/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow => derivation/least-effort/run/gadt/014 eq deepcons}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/gadt/_common (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/_common (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-big/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-big/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-big/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-big/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences => derivation/least-effort/run/regression/dependent-givens-big}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-small-deep/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-small-deep/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-small-deep/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-small-deep/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences => derivation/least-effort/run/regression/dependent-givens-small-deep}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-small-shallow/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-small-shallow/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-small-shallow/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/dependent-givens-small-shallow/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex => derivation/least-effort/run/regression/dependent-givens-small-shallow}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/lost-deceq-four-occurences/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/lost-deceq-four-occurences/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/lost-deceq-four-occurences/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/lost-deceq-four-occurences/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple => derivation/least-effort/run/regression/lost-deceq-four-occurences}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/lost-deceq-three-occurences/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/lost-deceq-three-occurences/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/lost-deceq-three-occurences/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/lost-deceq-three-occurences/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency => derivation/least-effort/run/regression/lost-deceq-three-occurences}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-multiple-complex/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-multiple-complex/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-multiple-complex/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-multiple-complex/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent => derivation/least-effort/run/regression/too-early-rename-multiple-complex}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-multiple-simple/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-multiple-simple/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-multiple-simple/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-multiple-simple/expected (100%)
 rename tests/{gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch => derivation/least-effort/run/regression/too-early-rename-multiple-simple}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-single-dependency/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-single-dependency/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-single-dependency/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/too-early-rename-single-dependency/expected (100%)
 rename tests/{gen-derivation/inputvalidation/bad-args-in-target-type => derivation/least-effort/run/regression/too-early-rename-single-dependency}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/unification-mismatch-dependent/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/unification-mismatch-dependent/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/unification-mismatch-dependent/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/unification-mismatch-dependent/expected (100%)
 rename tests/{gen-derivation/inputvalidation/bad-fuel => derivation/least-effort/run/regression/unification-mismatch-dependent}/run (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/unification-name-mismatch/DerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/unification-name-mismatch/RunDerivedGen.idr (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/unification-name-mismatch/derive.ipkg (100%)
 rename tests/{gen-derivation => }/derivation/least-effort/run/regression/unification-name-mismatch/expected (100%)
 rename tests/{gen-derivation/inputvalidation/bad-param-names => derivation/least-effort/run/regression/unification-name-mismatch}/run (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/_common/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/_common/arg-deps.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/_common/run (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-001-simple/DepsCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-001-simple/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-001-simple/arg-deps.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-001-simple/expected (100%)
 rename tests/{gen-derivation/inputvalidation/external-gens => derivation/utils/arg-deps/deps-001-simple}/run (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-002-longer-transitive/DepsCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-002-longer-transitive/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-002-longer-transitive/arg-deps.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-002-longer-transitive/expected (100%)
 rename tests/{gen-derivation/inputvalidation/non-gen-target-type => derivation/utils/arg-deps/deps-002-longer-transitive}/run (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-003-lambda-shadowing/DepsCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-003-lambda-shadowing/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-003-lambda-shadowing/arg-deps.ipkg (100%)
 rename tests/{gen-derivation/derivation/core/norec t-pi->.. w_ext 001 => derivation/utils/arg-deps/deps-003-lambda-shadowing}/dont-run (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-003-lambda-shadowing/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-004-case/DepsCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-004-case/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-004-case/arg-deps.ipkg (100%)
 rename tests/{gen-derivation/derivation/infra/empty-cons run 013 => derivation/utils/arg-deps/deps-004-case}/dont-run (100%)
 rename tests/{gen-derivation => derivation/utils}/arg-deps/deps-004-case/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/_common/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/_common/canonic-sig.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/_common/run (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/dep-params/CanonicSigCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/dep-params/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/dep-params/canonic-sig.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/dep-params/expected (100%)
 rename tests/{gen-derivation/inputvalidation/odd-or-lacking-gen-params => derivation/utils/canonicsig/dep-params}/run (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/nondep-expl-params/CanonicSigCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/nondep-expl-params/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/nondep-expl-params/canonic-sig.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/nondep-expl-params/expected (100%)
 rename tests/{gen-derivation/inputvalidation/unexpected-gen-target => derivation/utils/canonicsig/nondep-expl-params}/run (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/nondep-mixed-params/CanonicSigCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/nondep-mixed-params/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/nondep-mixed-params/canonic-sig.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/nondep-mixed-params/expected (100%)
 rename tests/{gen-derivation/inputvalidation/unexpected-multiplicity => derivation/utils/canonicsig/nondep-mixed-params}/run (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/trivial/CanonicSigCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/trivial/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/trivial/canonic-sig.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/canonicsig/trivial/expected (100%)
 rename tests/{gen-derivation/inputvalidation/wrong-params-order => derivation/utils/canonicsig/trivial}/run (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/_common-deep-cons-app/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/_common-deep-cons-app/cons.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/_common-deep-cons-app/run (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-001/ConsApps.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-001/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-001/cons.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-001/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-001/run (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-002-neg/ConsApps.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-002-neg/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-002-neg/cons.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-002-neg/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-002-neg/run (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-003/ConsApps.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-003/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-003/cons.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-003/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-003/run (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-004/ConsApps.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-004/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-004/cons.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-004/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-004/run (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-005-neg/ConsApps.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-005-neg/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-005-neg/cons.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-005-neg/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-005-neg/run (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-006/ConsApps.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-006/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-006/cons.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-006/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/cons-analysis/deep-cons-app-006/run (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/_common/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/_common/renaming-ttimp-eq.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/_common/run (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/renaming/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/renaming/RenamingTTImpEqCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/renaming/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/renaming/renaming-ttimp-eq.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/renaming/run (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/simple/Infra.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/simple/RenamingTTImpEqCheck.idr (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/simple/expected (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/simple/renaming-ttimp-eq.ipkg (100%)
 rename tests/{gen-derivation => derivation/utils}/up-to-renaming-ttimp-eq/simple/run (100%)
 delete mode 120000 tests/gen-derivation/derivation/distribution/_common

diff --git a/.github/workflows/ci-deptycheck.yml b/.github/workflows/ci-deptycheck.yml
index 816ca23d0..1a25fd8c1 100644
--- a/.github/workflows/ci-deptycheck.yml
+++ b/.github/workflows/ci-deptycheck.yml
@@ -188,8 +188,8 @@ jobs:
         run: |
           (
           echo -n "derivation-test-sets=["
-          find tests/gen-derivation/ -type f,l -name run | \
-            grep -v '/_' | sed 's|^tests/gen-derivation/|"|' | sed 's|/[^/]*/run$|"|' | \
+          find tests/derivation/ -type f,l -name run | \
+            grep -v '/_' | sed 's|^tests/derivation/|"|' | sed 's|/[^/]*/run$|"|' | \
             sort | uniq | awk 'ORS=", "' | head -c -2
           echo "]"
           ) >> "$GITHUB_OUTPUT"
@@ -216,7 +216,7 @@ jobs:
       - name: Untar the `pack` dir
         run: tar -xvf "${{ env.pack_dir_file }}" --one-top-level=/ --touch
 
-      - run: pack test deptycheck "gen-derivation/${{matrix.test_set}}"
+      - run: pack test deptycheck "derivation/${{matrix.test_set}}"
 
   #################
   # Test examples #
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b354cfeae..a2ad4aef3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -83,26 +83,26 @@ deptycheck:test:derive:
       - "*"
       - src/**/*
       - tests/*
-      - tests/gen-derivation/**/*
+      - tests/derivation/**/*
   parallel:
     matrix:
       - test_set:
         - inputvalidation/
-        - up-to-renaming-ttimp-eq/
-        - canonicsig/
-        - cons-analysis/
-        - derivation/infra/
-        - arg-deps/
-        - derivation/least-effort/print/adt
-        - derivation/least-effort/print/gadt
-        - derivation/least-effort/print/regression
-        - derivation/least-effort/run/adt
-        - derivation/least-effort/run/gadt
-        - derivation/least-effort/run/regression
-        - derivation/core/
-        - derivation/distribution/
+        - infra/
+        - utils/up-to-renaming-ttimp-eq/
+        - utils/canonicsig/
+        - utils/cons-analysis/
+        - utils/arg-deps/
+        - least-effort/print/adt
+        - least-effort/print/gadt
+        - least-effort/print/regression
+        - least-effort/run/adt
+        - least-effort/run/gadt
+        - least-effort/run/regression
+        - core/
+        - distribution/
   script:
-    - NUM_THREADS=2 pack test deptycheck gen-derivation/"$test_set"
+    - NUM_THREADS=2 pack test deptycheck derivation/"$test_set"
 
 pil:build:
   stage: pil:build
diff --git a/tests/gen-derivation/derivation/_common/AlternativeCore.idr b/tests/derivation/_common/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/_common/AlternativeCore.idr
rename to tests/derivation/_common/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/_common/PrintDerivation.idr b/tests/derivation/_common/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/_common/PrintDerivation.idr
rename to tests/derivation/_common/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/_common/RunDerivedGen.idr b/tests/derivation/_common/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/_common/RunDerivedGen.idr
rename to tests/derivation/_common/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/_common/derive.ipkg b/tests/derivation/_common/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/_common/derive.ipkg
rename to tests/derivation/_common/derive.ipkg
diff --git a/tests/gen-derivation/derivation/_common/run b/tests/derivation/_common/run
similarity index 100%
rename from tests/gen-derivation/derivation/_common/run
rename to tests/derivation/_common/run
diff --git a/tests/gen-derivation/derivation/core/_common b/tests/derivation/core/_common
similarity index 100%
rename from tests/gen-derivation/derivation/core/_common
rename to tests/derivation/core/_common
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 001/DerivedGen.idr b/tests/derivation/core/norec nodep noext 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 001/DerivedGen.idr
rename to tests/derivation/core/norec nodep noext 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 001/RunDerivedGen.idr b/tests/derivation/core/norec nodep noext 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 001/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep noext 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 001/derive.ipkg b/tests/derivation/core/norec nodep noext 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 001/derive.ipkg
rename to tests/derivation/core/norec nodep noext 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 001/expected b/tests/derivation/core/norec nodep noext 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 001/expected
rename to tests/derivation/core/norec nodep noext 001/expected
diff --git a/tests/gen-derivation/arg-deps/deps-001-simple/run b/tests/derivation/core/norec nodep noext 001/run
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-001-simple/run
rename to tests/derivation/core/norec nodep noext 001/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 002/DerivedGen.idr b/tests/derivation/core/norec nodep noext 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 002/DerivedGen.idr
rename to tests/derivation/core/norec nodep noext 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 002/RunDerivedGen.idr b/tests/derivation/core/norec nodep noext 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 002/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep noext 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 002/derive.ipkg b/tests/derivation/core/norec nodep noext 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 002/derive.ipkg
rename to tests/derivation/core/norec nodep noext 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 002/expected b/tests/derivation/core/norec nodep noext 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 002/expected
rename to tests/derivation/core/norec nodep noext 002/expected
diff --git a/tests/gen-derivation/arg-deps/deps-002-longer-transitive/run b/tests/derivation/core/norec nodep noext 002/run
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-002-longer-transitive/run
rename to tests/derivation/core/norec nodep noext 002/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 003-neg/DerivedGen.idr b/tests/derivation/core/norec nodep noext 003-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 003-neg/DerivedGen.idr
rename to tests/derivation/core/norec nodep noext 003-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 003-neg/RunDerivedGen.idr b/tests/derivation/core/norec nodep noext 003-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 003-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep noext 003-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 003-neg/derive.ipkg b/tests/derivation/core/norec nodep noext 003-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 003-neg/derive.ipkg
rename to tests/derivation/core/norec nodep noext 003-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 003-neg/expected b/tests/derivation/core/norec nodep noext 003-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 003-neg/expected
rename to tests/derivation/core/norec nodep noext 003-neg/expected
diff --git a/tests/gen-derivation/canonicsig/dep-params/run b/tests/derivation/core/norec nodep noext 003-neg/run
similarity index 100%
rename from tests/gen-derivation/canonicsig/dep-params/run
rename to tests/derivation/core/norec nodep noext 003-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 004-neg/DerivedGen.idr b/tests/derivation/core/norec nodep noext 004-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 004-neg/DerivedGen.idr
rename to tests/derivation/core/norec nodep noext 004-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 004-neg/RunDerivedGen.idr b/tests/derivation/core/norec nodep noext 004-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 004-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep noext 004-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 004-neg/derive.ipkg b/tests/derivation/core/norec nodep noext 004-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 004-neg/derive.ipkg
rename to tests/derivation/core/norec nodep noext 004-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 004-neg/expected b/tests/derivation/core/norec nodep noext 004-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 004-neg/expected
rename to tests/derivation/core/norec nodep noext 004-neg/expected
diff --git a/tests/gen-derivation/canonicsig/nondep-expl-params/run b/tests/derivation/core/norec nodep noext 004-neg/run
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-expl-params/run
rename to tests/derivation/core/norec nodep noext 004-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 005-neg/DerivedGen.idr b/tests/derivation/core/norec nodep noext 005-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 005-neg/DerivedGen.idr
rename to tests/derivation/core/norec nodep noext 005-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 005-neg/RunDerivedGen.idr b/tests/derivation/core/norec nodep noext 005-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 005-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep noext 005-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 005-neg/derive.ipkg b/tests/derivation/core/norec nodep noext 005-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 005-neg/derive.ipkg
rename to tests/derivation/core/norec nodep noext 005-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 005-neg/expected b/tests/derivation/core/norec nodep noext 005-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 005-neg/expected
rename to tests/derivation/core/norec nodep noext 005-neg/expected
diff --git a/tests/gen-derivation/canonicsig/nondep-mixed-params/run b/tests/derivation/core/norec nodep noext 005-neg/run
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-mixed-params/run
rename to tests/derivation/core/norec nodep noext 005-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 001/DerivedGen.idr b/tests/derivation/core/norec nodep w_ext 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 001/DerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 001/RunDerivedGen.idr b/tests/derivation/core/norec nodep w_ext 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 001/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 001/derive.ipkg b/tests/derivation/core/norec nodep w_ext 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 001/derive.ipkg
rename to tests/derivation/core/norec nodep w_ext 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 001/expected b/tests/derivation/core/norec nodep w_ext 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 001/expected
rename to tests/derivation/core/norec nodep w_ext 001/expected
diff --git a/tests/gen-derivation/canonicsig/trivial/run b/tests/derivation/core/norec nodep w_ext 001/run
similarity index 100%
rename from tests/gen-derivation/canonicsig/trivial/run
rename to tests/derivation/core/norec nodep w_ext 001/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 002/DerivedGen.idr b/tests/derivation/core/norec nodep w_ext 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 002/DerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 002/RunDerivedGen.idr b/tests/derivation/core/norec nodep w_ext 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 002/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 002/derive.ipkg b/tests/derivation/core/norec nodep w_ext 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 002/derive.ipkg
rename to tests/derivation/core/norec nodep w_ext 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 002/expected b/tests/derivation/core/norec nodep w_ext 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 002/expected
rename to tests/derivation/core/norec nodep w_ext 002/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 001/run b/tests/derivation/core/norec nodep w_ext 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 001/run
rename to tests/derivation/core/norec nodep w_ext 002/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 003/DerivedGen.idr b/tests/derivation/core/norec nodep w_ext 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 003/DerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 003/RunDerivedGen.idr b/tests/derivation/core/norec nodep w_ext 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 003/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 003/derive.ipkg b/tests/derivation/core/norec nodep w_ext 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 003/derive.ipkg
rename to tests/derivation/core/norec nodep w_ext 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 003/expected b/tests/derivation/core/norec nodep w_ext 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 003/expected
rename to tests/derivation/core/norec nodep w_ext 003/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 002/run b/tests/derivation/core/norec nodep w_ext 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 002/run
rename to tests/derivation/core/norec nodep w_ext 003/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 004/DerivedGen.idr b/tests/derivation/core/norec nodep w_ext 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 004/DerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 004/RunDerivedGen.idr b/tests/derivation/core/norec nodep w_ext 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 004/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 004/derive.ipkg b/tests/derivation/core/norec nodep w_ext 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 004/derive.ipkg
rename to tests/derivation/core/norec nodep w_ext 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 004/expected b/tests/derivation/core/norec nodep w_ext 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 004/expected
rename to tests/derivation/core/norec nodep w_ext 004/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 003-neg/run b/tests/derivation/core/norec nodep w_ext 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 003-neg/run
rename to tests/derivation/core/norec nodep w_ext 004/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 005/DerivedGen.idr b/tests/derivation/core/norec nodep w_ext 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 005/DerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 005/RunDerivedGen.idr b/tests/derivation/core/norec nodep w_ext 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 005/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 005/derive.ipkg b/tests/derivation/core/norec nodep w_ext 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 005/derive.ipkg
rename to tests/derivation/core/norec nodep w_ext 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 005/expected b/tests/derivation/core/norec nodep w_ext 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 005/expected
rename to tests/derivation/core/norec nodep w_ext 005/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 004-neg/run b/tests/derivation/core/norec nodep w_ext 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 004-neg/run
rename to tests/derivation/core/norec nodep w_ext 005/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 006/DerivedGen.idr b/tests/derivation/core/norec nodep w_ext 006/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 006/DerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 006/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 006/RunDerivedGen.idr b/tests/derivation/core/norec nodep w_ext 006/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 006/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 006/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 006/derive.ipkg b/tests/derivation/core/norec nodep w_ext 006/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 006/derive.ipkg
rename to tests/derivation/core/norec nodep w_ext 006/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 006/expected b/tests/derivation/core/norec nodep w_ext 006/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 006/expected
rename to tests/derivation/core/norec nodep w_ext 006/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep noext 005-neg/run b/tests/derivation/core/norec nodep w_ext 006/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep noext 005-neg/run
rename to tests/derivation/core/norec nodep w_ext 006/run
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 007/DerivedGen.idr b/tests/derivation/core/norec nodep w_ext 007/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 007/DerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 007/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 007/RunDerivedGen.idr b/tests/derivation/core/norec nodep w_ext 007/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 007/RunDerivedGen.idr
rename to tests/derivation/core/norec nodep w_ext 007/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 007/derive.ipkg b/tests/derivation/core/norec nodep w_ext 007/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 007/derive.ipkg
rename to tests/derivation/core/norec nodep w_ext 007/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 007/expected b/tests/derivation/core/norec nodep w_ext 007/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 007/expected
rename to tests/derivation/core/norec nodep w_ext 007/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 001/run b/tests/derivation/core/norec nodep w_ext 007/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 001/run
rename to tests/derivation/core/norec nodep w_ext 007/run
diff --git a/tests/gen-derivation/derivation/core/norec part noext 001-neg/DerivedGen.idr b/tests/derivation/core/norec part noext 001-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 001-neg/DerivedGen.idr
rename to tests/derivation/core/norec part noext 001-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 001-neg/RunDerivedGen.idr b/tests/derivation/core/norec part noext 001-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 001-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec part noext 001-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 001-neg/derive.ipkg b/tests/derivation/core/norec part noext 001-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 001-neg/derive.ipkg
rename to tests/derivation/core/norec part noext 001-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part noext 001-neg/expected b/tests/derivation/core/norec part noext 001-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 001-neg/expected
rename to tests/derivation/core/norec part noext 001-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 002/run b/tests/derivation/core/norec part noext 001-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 002/run
rename to tests/derivation/core/norec part noext 001-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec part noext 002-neg/DerivedGen.idr b/tests/derivation/core/norec part noext 002-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 002-neg/DerivedGen.idr
rename to tests/derivation/core/norec part noext 002-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 002-neg/RunDerivedGen.idr b/tests/derivation/core/norec part noext 002-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 002-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec part noext 002-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 002-neg/derive.ipkg b/tests/derivation/core/norec part noext 002-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 002-neg/derive.ipkg
rename to tests/derivation/core/norec part noext 002-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part noext 002-neg/expected b/tests/derivation/core/norec part noext 002-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 002-neg/expected
rename to tests/derivation/core/norec part noext 002-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 003/run b/tests/derivation/core/norec part noext 002-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 003/run
rename to tests/derivation/core/norec part noext 002-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec part noext 003/DerivedGen.idr b/tests/derivation/core/norec part noext 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 003/DerivedGen.idr
rename to tests/derivation/core/norec part noext 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 003/RunDerivedGen.idr b/tests/derivation/core/norec part noext 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 003/RunDerivedGen.idr
rename to tests/derivation/core/norec part noext 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 003/derive.ipkg b/tests/derivation/core/norec part noext 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 003/derive.ipkg
rename to tests/derivation/core/norec part noext 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part noext 003/expected b/tests/derivation/core/norec part noext 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 003/expected
rename to tests/derivation/core/norec part noext 003/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 004/run b/tests/derivation/core/norec part noext 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 004/run
rename to tests/derivation/core/norec part noext 003/run
diff --git a/tests/gen-derivation/derivation/core/norec part noext 004/DerivedGen.idr b/tests/derivation/core/norec part noext 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 004/DerivedGen.idr
rename to tests/derivation/core/norec part noext 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 004/RunDerivedGen.idr b/tests/derivation/core/norec part noext 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 004/RunDerivedGen.idr
rename to tests/derivation/core/norec part noext 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 004/derive.ipkg b/tests/derivation/core/norec part noext 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 004/derive.ipkg
rename to tests/derivation/core/norec part noext 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part noext 004/expected b/tests/derivation/core/norec part noext 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 004/expected
rename to tests/derivation/core/norec part noext 004/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 005/run b/tests/derivation/core/norec part noext 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 005/run
rename to tests/derivation/core/norec part noext 004/run
diff --git a/tests/gen-derivation/derivation/core/norec part noext 005/DerivedGen.idr b/tests/derivation/core/norec part noext 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 005/DerivedGen.idr
rename to tests/derivation/core/norec part noext 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 005/RunDerivedGen.idr b/tests/derivation/core/norec part noext 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 005/RunDerivedGen.idr
rename to tests/derivation/core/norec part noext 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part noext 005/derive.ipkg b/tests/derivation/core/norec part noext 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 005/derive.ipkg
rename to tests/derivation/core/norec part noext 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part noext 005/expected b/tests/derivation/core/norec part noext 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 005/expected
rename to tests/derivation/core/norec part noext 005/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 006/run b/tests/derivation/core/norec part noext 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 006/run
rename to tests/derivation/core/norec part noext 005/run
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 001/DerivedGen.idr b/tests/derivation/core/norec part w_ext 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 001/DerivedGen.idr
rename to tests/derivation/core/norec part w_ext 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 001/RunDerivedGen.idr b/tests/derivation/core/norec part w_ext 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 001/RunDerivedGen.idr
rename to tests/derivation/core/norec part w_ext 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 001/derive.ipkg b/tests/derivation/core/norec part w_ext 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 001/derive.ipkg
rename to tests/derivation/core/norec part w_ext 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 001/expected b/tests/derivation/core/norec part w_ext 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 001/expected
rename to tests/derivation/core/norec part w_ext 001/expected
diff --git a/tests/gen-derivation/derivation/core/norec nodep w_ext 007/run b/tests/derivation/core/norec part w_ext 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec nodep w_ext 007/run
rename to tests/derivation/core/norec part w_ext 001/run
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 002/DerivedGen.idr b/tests/derivation/core/norec part w_ext 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 002/DerivedGen.idr
rename to tests/derivation/core/norec part w_ext 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 002/RunDerivedGen.idr b/tests/derivation/core/norec part w_ext 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 002/RunDerivedGen.idr
rename to tests/derivation/core/norec part w_ext 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 002/derive.ipkg b/tests/derivation/core/norec part w_ext 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 002/derive.ipkg
rename to tests/derivation/core/norec part w_ext 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 002/expected b/tests/derivation/core/norec part w_ext 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 002/expected
rename to tests/derivation/core/norec part w_ext 002/expected
diff --git a/tests/gen-derivation/derivation/core/norec part noext 001-neg/run b/tests/derivation/core/norec part w_ext 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 001-neg/run
rename to tests/derivation/core/norec part w_ext 002/run
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 003/DerivedGen.idr b/tests/derivation/core/norec part w_ext 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 003/DerivedGen.idr
rename to tests/derivation/core/norec part w_ext 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 003/RunDerivedGen.idr b/tests/derivation/core/norec part w_ext 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 003/RunDerivedGen.idr
rename to tests/derivation/core/norec part w_ext 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 003/derive.ipkg b/tests/derivation/core/norec part w_ext 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 003/derive.ipkg
rename to tests/derivation/core/norec part w_ext 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 003/expected b/tests/derivation/core/norec part w_ext 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 003/expected
rename to tests/derivation/core/norec part w_ext 003/expected
diff --git a/tests/gen-derivation/derivation/core/norec part noext 002-neg/run b/tests/derivation/core/norec part w_ext 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 002-neg/run
rename to tests/derivation/core/norec part w_ext 003/run
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 004-neg/DerivedGen.idr b/tests/derivation/core/norec part w_ext 004-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 004-neg/DerivedGen.idr
rename to tests/derivation/core/norec part w_ext 004-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 004-neg/RunDerivedGen.idr b/tests/derivation/core/norec part w_ext 004-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 004-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec part w_ext 004-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 004-neg/derive.ipkg b/tests/derivation/core/norec part w_ext 004-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 004-neg/derive.ipkg
rename to tests/derivation/core/norec part w_ext 004-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 004-neg/expected b/tests/derivation/core/norec part w_ext 004-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 004-neg/expected
rename to tests/derivation/core/norec part w_ext 004-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec part noext 003/run b/tests/derivation/core/norec part w_ext 004-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 003/run
rename to tests/derivation/core/norec part w_ext 004-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 005-neg/DerivedGen.idr b/tests/derivation/core/norec part w_ext 005-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 005-neg/DerivedGen.idr
rename to tests/derivation/core/norec part w_ext 005-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 005-neg/RunDerivedGen.idr b/tests/derivation/core/norec part w_ext 005-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 005-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec part w_ext 005-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 005-neg/derive.ipkg b/tests/derivation/core/norec part w_ext 005-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 005-neg/derive.ipkg
rename to tests/derivation/core/norec part w_ext 005-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 005-neg/expected b/tests/derivation/core/norec part w_ext 005-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 005-neg/expected
rename to tests/derivation/core/norec part w_ext 005-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec part noext 004/run b/tests/derivation/core/norec part w_ext 005-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 004/run
rename to tests/derivation/core/norec part w_ext 005-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 006-neg/DerivedGen.idr b/tests/derivation/core/norec part w_ext 006-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 006-neg/DerivedGen.idr
rename to tests/derivation/core/norec part w_ext 006-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 006-neg/RunDerivedGen.idr b/tests/derivation/core/norec part w_ext 006-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 006-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec part w_ext 006-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 006-neg/derive.ipkg b/tests/derivation/core/norec part w_ext 006-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 006-neg/derive.ipkg
rename to tests/derivation/core/norec part w_ext 006-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 006-neg/expected b/tests/derivation/core/norec part w_ext 006-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 006-neg/expected
rename to tests/derivation/core/norec part w_ext 006-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec part noext 005/run b/tests/derivation/core/norec part w_ext 006-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part noext 005/run
rename to tests/derivation/core/norec part w_ext 006-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/DerivedGen.idr b/tests/derivation/core/norec t-..->p. noext 001-shdw/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/DerivedGen.idr
rename to tests/derivation/core/norec t-..->p. noext 001-shdw/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/RunDerivedGen.idr b/tests/derivation/core/norec t-..->p. noext 001-shdw/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/RunDerivedGen.idr
rename to tests/derivation/core/norec t-..->p. noext 001-shdw/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/derive.ipkg b/tests/derivation/core/norec t-..->p. noext 001-shdw/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/derive.ipkg
rename to tests/derivation/core/norec t-..->p. noext 001-shdw/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/expected b/tests/derivation/core/norec t-..->p. noext 001-shdw/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/expected
rename to tests/derivation/core/norec t-..->p. noext 001-shdw/expected
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 001/run b/tests/derivation/core/norec t-..->p. noext 001-shdw/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 001/run
rename to tests/derivation/core/norec t-..->p. noext 001-shdw/run
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001/DerivedGen.idr b/tests/derivation/core/norec t-..->p. noext 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001/DerivedGen.idr
rename to tests/derivation/core/norec t-..->p. noext 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001/RunDerivedGen.idr b/tests/derivation/core/norec t-..->p. noext 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001/RunDerivedGen.idr
rename to tests/derivation/core/norec t-..->p. noext 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001/derive.ipkg b/tests/derivation/core/norec t-..->p. noext 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001/derive.ipkg
rename to tests/derivation/core/norec t-..->p. noext 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001/expected b/tests/derivation/core/norec t-..->p. noext 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001/expected
rename to tests/derivation/core/norec t-..->p. noext 001/expected
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 002/run b/tests/derivation/core/norec t-..->p. noext 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 002/run
rename to tests/derivation/core/norec t-..->p. noext 001/run
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 002/DerivedGen.idr b/tests/derivation/core/norec t-..->p. noext 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 002/DerivedGen.idr
rename to tests/derivation/core/norec t-..->p. noext 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 002/RunDerivedGen.idr b/tests/derivation/core/norec t-..->p. noext 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 002/RunDerivedGen.idr
rename to tests/derivation/core/norec t-..->p. noext 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 002/derive.ipkg b/tests/derivation/core/norec t-..->p. noext 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 002/derive.ipkg
rename to tests/derivation/core/norec t-..->p. noext 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 002/expected b/tests/derivation/core/norec t-..->p. noext 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 002/expected
rename to tests/derivation/core/norec t-..->p. noext 002/expected
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 003/run b/tests/derivation/core/norec t-..->p. noext 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 003/run
rename to tests/derivation/core/norec t-..->p. noext 002/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. noext 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. noext 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. noext 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. noext 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/derive.ipkg b/tests/derivation/core/norec t-p.->.. noext 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. noext 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/expected b/tests/derivation/core/norec t-p.->.. noext 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/expected
rename to tests/derivation/core/norec t-p.->.. noext 001/expected
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 004-neg/run b/tests/derivation/core/norec t-p.->.. noext 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 004-neg/run
rename to tests/derivation/core/norec t-p.->.. noext 001/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. noext 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. noext 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. noext 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. noext 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/derive.ipkg b/tests/derivation/core/norec t-p.->.. noext 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. noext 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/expected b/tests/derivation/core/norec t-p.->.. noext 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/expected
rename to tests/derivation/core/norec t-p.->.. noext 002/expected
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 005-neg/run b/tests/derivation/core/norec t-p.->.. noext 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 005-neg/run
rename to tests/derivation/core/norec t-p.->.. noext 002/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. noext 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. noext 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. noext 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. noext 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/derive.ipkg b/tests/derivation/core/norec t-p.->.. noext 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. noext 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/expected b/tests/derivation/core/norec t-p.->.. noext 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/expected
rename to tests/derivation/core/norec t-p.->.. noext 003/expected
diff --git a/tests/gen-derivation/derivation/core/norec part w_ext 006-neg/run b/tests/derivation/core/norec t-p.->.. noext 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec part w_ext 006-neg/run
rename to tests/derivation/core/norec t-p.->.. noext 003/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/derive.ipkg b/tests/derivation/core/norec t-p.->.. w_ext 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. w_ext 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/expected b/tests/derivation/core/norec t-p.->.. w_ext 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/expected
rename to tests/derivation/core/norec t-p.->.. w_ext 001/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/run b/tests/derivation/core/norec t-p.->.. w_ext 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001-shdw/run
rename to tests/derivation/core/norec t-p.->.. w_ext 001/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/derive.ipkg b/tests/derivation/core/norec t-p.->.. w_ext 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. w_ext 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/expected b/tests/derivation/core/norec t-p.->.. w_ext 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/expected
rename to tests/derivation/core/norec t-p.->.. w_ext 002/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 001/run b/tests/derivation/core/norec t-p.->.. w_ext 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 001/run
rename to tests/derivation/core/norec t-p.->.. w_ext 002/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 003-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 003-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 003-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 003-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/derive.ipkg b/tests/derivation/core/norec t-p.->.. w_ext 003-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. w_ext 003-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/expected b/tests/derivation/core/norec t-p.->.. w_ext 003-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/expected
rename to tests/derivation/core/norec t-p.->.. w_ext 003-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-..->p. noext 002/run b/tests/derivation/core/norec t-p.->.. w_ext 003-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-..->p. noext 002/run
rename to tests/derivation/core/norec t-p.->.. w_ext 003-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 004-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 004-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 004-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 004-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/derive.ipkg b/tests/derivation/core/norec t-p.->.. w_ext 004-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. w_ext 004-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/expected b/tests/derivation/core/norec t-p.->.. w_ext 004-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/expected
rename to tests/derivation/core/norec t-p.->.. w_ext 004-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/run b/tests/derivation/core/norec t-p.->.. w_ext 004-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 001/run
rename to tests/derivation/core/norec t-p.->.. w_ext 004-neg/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/derive.ipkg b/tests/derivation/core/norec t-p.->.. w_ext 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. w_ext 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/expected b/tests/derivation/core/norec t-p.->.. w_ext 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/expected
rename to tests/derivation/core/norec t-p.->.. w_ext 005/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/run b/tests/derivation/core/norec t-p.->.. w_ext 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 002/run
rename to tests/derivation/core/norec t-p.->.. w_ext 005/run
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/DerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 006/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/DerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 006/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/RunDerivedGen.idr b/tests/derivation/core/norec t-p.->.. w_ext 006/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/RunDerivedGen.idr
rename to tests/derivation/core/norec t-p.->.. w_ext 006/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/derive.ipkg b/tests/derivation/core/norec t-p.->.. w_ext 006/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/derive.ipkg
rename to tests/derivation/core/norec t-p.->.. w_ext 006/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/expected b/tests/derivation/core/norec t-p.->.. w_ext 006/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/expected
rename to tests/derivation/core/norec t-p.->.. w_ext 006/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/run b/tests/derivation/core/norec t-p.->.. w_ext 006/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. noext 003/run
rename to tests/derivation/core/norec t-p.->.. w_ext 006/run
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/DerivedGen.idr b/tests/derivation/core/norec t-pi->.. noext 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/DerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. noext 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/RunDerivedGen.idr b/tests/derivation/core/norec t-pi->.. noext 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/RunDerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. noext 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/derive.ipkg b/tests/derivation/core/norec t-pi->.. noext 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/derive.ipkg
rename to tests/derivation/core/norec t-pi->.. noext 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/expected b/tests/derivation/core/norec t-pi->.. noext 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/expected
rename to tests/derivation/core/norec t-pi->.. noext 001/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/run b/tests/derivation/core/norec t-pi->.. noext 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 001/run
rename to tests/derivation/core/norec t-pi->.. noext 001/run
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/DerivedGen.idr b/tests/derivation/core/norec t-pi->.. noext 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/DerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. noext 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/RunDerivedGen.idr b/tests/derivation/core/norec t-pi->.. noext 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/RunDerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. noext 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/derive.ipkg b/tests/derivation/core/norec t-pi->.. noext 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/derive.ipkg
rename to tests/derivation/core/norec t-pi->.. noext 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/expected b/tests/derivation/core/norec t-pi->.. noext 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/expected
rename to tests/derivation/core/norec t-pi->.. noext 002/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/run b/tests/derivation/core/norec t-pi->.. noext 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 002/run
rename to tests/derivation/core/norec t-pi->.. noext 002/run
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/DerivedGen.idr b/tests/derivation/core/norec t-pi->.. noext 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/DerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. noext 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/RunDerivedGen.idr b/tests/derivation/core/norec t-pi->.. noext 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/RunDerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. noext 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/derive.ipkg b/tests/derivation/core/norec t-pi->.. noext 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/derive.ipkg
rename to tests/derivation/core/norec t-pi->.. noext 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/expected b/tests/derivation/core/norec t-pi->.. noext 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/expected
rename to tests/derivation/core/norec t-pi->.. noext 003/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/run b/tests/derivation/core/norec t-pi->.. noext 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 003-neg/run
rename to tests/derivation/core/norec t-pi->.. noext 003/run
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/DerivedGen.idr b/tests/derivation/core/norec t-pi->.. noext 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/DerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. noext 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/RunDerivedGen.idr b/tests/derivation/core/norec t-pi->.. noext 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/RunDerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. noext 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/derive.ipkg b/tests/derivation/core/norec t-pi->.. noext 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/derive.ipkg
rename to tests/derivation/core/norec t-pi->.. noext 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/expected b/tests/derivation/core/norec t-pi->.. noext 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/expected
rename to tests/derivation/core/norec t-pi->.. noext 004/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/run b/tests/derivation/core/norec t-pi->.. noext 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 004-neg/run
rename to tests/derivation/core/norec t-pi->.. noext 004/run
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/DerivedGen.idr b/tests/derivation/core/norec t-pi->.. w_ext 001-shdw/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/DerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. w_ext 001-shdw/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/RunDerivedGen.idr b/tests/derivation/core/norec t-pi->.. w_ext 001-shdw/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/RunDerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. w_ext 001-shdw/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/derive.ipkg b/tests/derivation/core/norec t-pi->.. w_ext 001-shdw/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/derive.ipkg
rename to tests/derivation/core/norec t-pi->.. w_ext 001-shdw/derive.ipkg
diff --git a/tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/dont-run b/tests/derivation/core/norec t-pi->.. w_ext 001-shdw/dont-run
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/dont-run
rename to tests/derivation/core/norec t-pi->.. w_ext 001-shdw/dont-run
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/expected b/tests/derivation/core/norec t-pi->.. w_ext 001-shdw/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/expected
rename to tests/derivation/core/norec t-pi->.. w_ext 001-shdw/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/DerivedGen.idr b/tests/derivation/core/norec t-pi->.. w_ext 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/DerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. w_ext 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/RunDerivedGen.idr b/tests/derivation/core/norec t-pi->.. w_ext 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/RunDerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. w_ext 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/derive.ipkg b/tests/derivation/core/norec t-pi->.. w_ext 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/derive.ipkg
rename to tests/derivation/core/norec t-pi->.. w_ext 001/derive.ipkg
diff --git a/tests/gen-derivation/arg-deps/deps-004-case/dont-run b/tests/derivation/core/norec t-pi->.. w_ext 001/dont-run
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-004-case/dont-run
rename to tests/derivation/core/norec t-pi->.. w_ext 001/dont-run
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/expected b/tests/derivation/core/norec t-pi->.. w_ext 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/expected
rename to tests/derivation/core/norec t-pi->.. w_ext 001/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/DerivedGen.idr b/tests/derivation/core/norec t-pi->.. w_ext 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/DerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. w_ext 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/RunDerivedGen.idr b/tests/derivation/core/norec t-pi->.. w_ext 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/RunDerivedGen.idr
rename to tests/derivation/core/norec t-pi->.. w_ext 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/derive.ipkg b/tests/derivation/core/norec t-pi->.. w_ext 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/derive.ipkg
rename to tests/derivation/core/norec t-pi->.. w_ext 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/expected b/tests/derivation/core/norec t-pi->.. w_ext 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/expected
rename to tests/derivation/core/norec t-pi->.. w_ext 002/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/run b/tests/derivation/core/norec t-pi->.. w_ext 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 005/run
rename to tests/derivation/core/norec t-pi->.. w_ext 002/run
diff --git a/tests/gen-derivation/derivation/core/tests-roadmap b/tests/derivation/core/tests-roadmap
similarity index 100%
rename from tests/gen-derivation/derivation/core/tests-roadmap
rename to tests/derivation/core/tests-roadmap
diff --git a/tests/gen-derivation/derivation/core/trivial 001/DerivedGen.idr b/tests/derivation/core/trivial 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 001/DerivedGen.idr
rename to tests/derivation/core/trivial 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/trivial 001/RunDerivedGen.idr b/tests/derivation/core/trivial 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 001/RunDerivedGen.idr
rename to tests/derivation/core/trivial 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/trivial 001/derive.ipkg b/tests/derivation/core/trivial 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 001/derive.ipkg
rename to tests/derivation/core/trivial 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/trivial 001/expected b/tests/derivation/core/trivial 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 001/expected
rename to tests/derivation/core/trivial 001/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/run b/tests/derivation/core/trivial 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-p.->.. w_ext 006/run
rename to tests/derivation/core/trivial 001/run
diff --git a/tests/gen-derivation/derivation/core/trivial 002-neg/DerivedGen.idr b/tests/derivation/core/trivial 002-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 002-neg/DerivedGen.idr
rename to tests/derivation/core/trivial 002-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/trivial 002-neg/RunDerivedGen.idr b/tests/derivation/core/trivial 002-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 002-neg/RunDerivedGen.idr
rename to tests/derivation/core/trivial 002-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/trivial 002-neg/derive.ipkg b/tests/derivation/core/trivial 002-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 002-neg/derive.ipkg
rename to tests/derivation/core/trivial 002-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/trivial 002-neg/expected b/tests/derivation/core/trivial 002-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 002-neg/expected
rename to tests/derivation/core/trivial 002-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/run b/tests/derivation/core/trivial 002-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 001/run
rename to tests/derivation/core/trivial 002-neg/run
diff --git a/tests/gen-derivation/derivation/core/trivial 003-neg/DerivedGen.idr b/tests/derivation/core/trivial 003-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 003-neg/DerivedGen.idr
rename to tests/derivation/core/trivial 003-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/trivial 003-neg/RunDerivedGen.idr b/tests/derivation/core/trivial 003-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 003-neg/RunDerivedGen.idr
rename to tests/derivation/core/trivial 003-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/trivial 003-neg/derive.ipkg b/tests/derivation/core/trivial 003-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 003-neg/derive.ipkg
rename to tests/derivation/core/trivial 003-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/trivial 003-neg/expected b/tests/derivation/core/trivial 003-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 003-neg/expected
rename to tests/derivation/core/trivial 003-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/run b/tests/derivation/core/trivial 003-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 002/run
rename to tests/derivation/core/trivial 003-neg/run
diff --git a/tests/gen-derivation/derivation/core/trivial 004-neg/DerivedGen.idr b/tests/derivation/core/trivial 004-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 004-neg/DerivedGen.idr
rename to tests/derivation/core/trivial 004-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/trivial 004-neg/RunDerivedGen.idr b/tests/derivation/core/trivial 004-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 004-neg/RunDerivedGen.idr
rename to tests/derivation/core/trivial 004-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/trivial 004-neg/derive.ipkg b/tests/derivation/core/trivial 004-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 004-neg/derive.ipkg
rename to tests/derivation/core/trivial 004-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/trivial 004-neg/expected b/tests/derivation/core/trivial 004-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 004-neg/expected
rename to tests/derivation/core/trivial 004-neg/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/run b/tests/derivation/core/trivial 004-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 003/run
rename to tests/derivation/core/trivial 004-neg/run
diff --git a/tests/gen-derivation/derivation/core/typealias con 001/DerivedGen.idr b/tests/derivation/core/typealias con 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 001/DerivedGen.idr
rename to tests/derivation/core/typealias con 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/typealias con 001/RunDerivedGen.idr b/tests/derivation/core/typealias con 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 001/RunDerivedGen.idr
rename to tests/derivation/core/typealias con 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/typealias con 001/derive.ipkg b/tests/derivation/core/typealias con 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 001/derive.ipkg
rename to tests/derivation/core/typealias con 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/typealias con 001/expected b/tests/derivation/core/typealias con 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 001/expected
rename to tests/derivation/core/typealias con 001/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/run b/tests/derivation/core/typealias con 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. noext 004/run
rename to tests/derivation/core/typealias con 001/run
diff --git a/tests/gen-derivation/derivation/core/typealias con 002/DerivedGen.idr b/tests/derivation/core/typealias con 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 002/DerivedGen.idr
rename to tests/derivation/core/typealias con 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/typealias con 002/RunDerivedGen.idr b/tests/derivation/core/typealias con 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 002/RunDerivedGen.idr
rename to tests/derivation/core/typealias con 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/typealias con 002/derive.ipkg b/tests/derivation/core/typealias con 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 002/derive.ipkg
rename to tests/derivation/core/typealias con 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/typealias con 002/expected b/tests/derivation/core/typealias con 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 002/expected
rename to tests/derivation/core/typealias con 002/expected
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/run b/tests/derivation/core/typealias con 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 002/run
rename to tests/derivation/core/typealias con 002/run
diff --git a/tests/gen-derivation/derivation/core/typealias con 003-neg/DerivedGen.idr b/tests/derivation/core/typealias con 003-neg/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 003-neg/DerivedGen.idr
rename to tests/derivation/core/typealias con 003-neg/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/typealias con 003-neg/RunDerivedGen.idr b/tests/derivation/core/typealias con 003-neg/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 003-neg/RunDerivedGen.idr
rename to tests/derivation/core/typealias con 003-neg/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/typealias con 003-neg/derive.ipkg b/tests/derivation/core/typealias con 003-neg/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 003-neg/derive.ipkg
rename to tests/derivation/core/typealias con 003-neg/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/typealias con 003-neg/expected b/tests/derivation/core/typealias con 003-neg/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 003-neg/expected
rename to tests/derivation/core/typealias con 003-neg/expected
diff --git a/tests/gen-derivation/derivation/core/trivial 001/run b/tests/derivation/core/typealias con 003-neg/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 001/run
rename to tests/derivation/core/typealias con 003-neg/run
diff --git a/tests/gen-derivation/derivation/core/upstream-2983/DerivedGen.idr b/tests/derivation/core/upstream-2983/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/upstream-2983/DerivedGen.idr
rename to tests/derivation/core/upstream-2983/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/upstream-2983/RunDerivedGen.idr b/tests/derivation/core/upstream-2983/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/core/upstream-2983/RunDerivedGen.idr
rename to tests/derivation/core/upstream-2983/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/core/upstream-2983/derive.ipkg b/tests/derivation/core/upstream-2983/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/core/upstream-2983/derive.ipkg
rename to tests/derivation/core/upstream-2983/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/upstream-2983/expected b/tests/derivation/core/upstream-2983/expected
similarity index 100%
rename from tests/gen-derivation/derivation/core/upstream-2983/expected
rename to tests/derivation/core/upstream-2983/expected
diff --git a/tests/gen-derivation/derivation/core/trivial 002-neg/run b/tests/derivation/core/upstream-2983/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 002-neg/run
rename to tests/derivation/core/upstream-2983/run
diff --git a/tests/derivation/distribution/_common b/tests/derivation/distribution/_common
new file mode 120000
index 000000000..88ea7a148
--- /dev/null
+++ b/tests/derivation/distribution/_common
@@ -0,0 +1 @@
+../../lib/distribution/_common/
\ No newline at end of file
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-001/CheckDistribution.idr b/tests/derivation/distribution/list-nat-001/CheckDistribution.idr
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-001/CheckDistribution.idr
rename to tests/derivation/distribution/list-nat-001/CheckDistribution.idr
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-001/DistrCheckCommon.idr b/tests/derivation/distribution/list-nat-001/DistrCheckCommon.idr
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-001/DistrCheckCommon.idr
rename to tests/derivation/distribution/list-nat-001/DistrCheckCommon.idr
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-001/expected b/tests/derivation/distribution/list-nat-001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-001/expected
rename to tests/derivation/distribution/list-nat-001/expected
diff --git a/tests/gen-derivation/derivation/core/trivial 003-neg/run b/tests/derivation/distribution/list-nat-001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 003-neg/run
rename to tests/derivation/distribution/list-nat-001/run
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-001/test.ipkg b/tests/derivation/distribution/list-nat-001/test.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-001/test.ipkg
rename to tests/derivation/distribution/list-nat-001/test.ipkg
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-002/CheckDistribution.idr b/tests/derivation/distribution/list-nat-002/CheckDistribution.idr
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-002/CheckDistribution.idr
rename to tests/derivation/distribution/list-nat-002/CheckDistribution.idr
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-002/DistrCheckCommon.idr b/tests/derivation/distribution/list-nat-002/DistrCheckCommon.idr
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-002/DistrCheckCommon.idr
rename to tests/derivation/distribution/list-nat-002/DistrCheckCommon.idr
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-002/expected b/tests/derivation/distribution/list-nat-002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-002/expected
rename to tests/derivation/distribution/list-nat-002/expected
diff --git a/tests/gen-derivation/derivation/core/trivial 004-neg/run b/tests/derivation/distribution/list-nat-002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/trivial 004-neg/run
rename to tests/derivation/distribution/list-nat-002/run
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-002/test.ipkg b/tests/derivation/distribution/list-nat-002/test.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-002/test.ipkg
rename to tests/derivation/distribution/list-nat-002/test.ipkg
diff --git a/tests/gen-derivation/derivation/distribution/nats-001/CheckDistribution.idr b/tests/derivation/distribution/nats-001/CheckDistribution.idr
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/nats-001/CheckDistribution.idr
rename to tests/derivation/distribution/nats-001/CheckDistribution.idr
diff --git a/tests/gen-derivation/derivation/distribution/nats-001/DistrCheckCommon.idr b/tests/derivation/distribution/nats-001/DistrCheckCommon.idr
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/nats-001/DistrCheckCommon.idr
rename to tests/derivation/distribution/nats-001/DistrCheckCommon.idr
diff --git a/tests/gen-derivation/derivation/distribution/nats-001/expected b/tests/derivation/distribution/nats-001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/nats-001/expected
rename to tests/derivation/distribution/nats-001/expected
diff --git a/tests/gen-derivation/derivation/core/typealias con 001/run b/tests/derivation/distribution/nats-001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 001/run
rename to tests/derivation/distribution/nats-001/run
diff --git a/tests/gen-derivation/derivation/distribution/nats-001/test.ipkg b/tests/derivation/distribution/nats-001/test.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/nats-001/test.ipkg
rename to tests/derivation/distribution/nats-001/test.ipkg
diff --git a/tests/gen-derivation/derivation/distribution/vect-nat-001/CheckDistribution.idr b/tests/derivation/distribution/vect-nat-001/CheckDistribution.idr
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/vect-nat-001/CheckDistribution.idr
rename to tests/derivation/distribution/vect-nat-001/CheckDistribution.idr
diff --git a/tests/gen-derivation/derivation/distribution/vect-nat-001/DistrCheckCommon.idr b/tests/derivation/distribution/vect-nat-001/DistrCheckCommon.idr
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/vect-nat-001/DistrCheckCommon.idr
rename to tests/derivation/distribution/vect-nat-001/DistrCheckCommon.idr
diff --git a/tests/gen-derivation/derivation/distribution/vect-nat-001/expected b/tests/derivation/distribution/vect-nat-001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/vect-nat-001/expected
rename to tests/derivation/distribution/vect-nat-001/expected
diff --git a/tests/gen-derivation/derivation/core/typealias con 002/run b/tests/derivation/distribution/vect-nat-001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 002/run
rename to tests/derivation/distribution/vect-nat-001/run
diff --git a/tests/gen-derivation/derivation/distribution/vect-nat-001/test.ipkg b/tests/derivation/distribution/vect-nat-001/test.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/vect-nat-001/test.ipkg
rename to tests/derivation/distribution/vect-nat-001/test.ipkg
diff --git a/tests/gen-derivation/derivation/infra/_common b/tests/derivation/infra/_common
similarity index 100%
rename from tests/gen-derivation/derivation/infra/_common
rename to tests/derivation/infra/_common
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 001/AlternativeCore.idr b/tests/derivation/infra/empty-body print 001/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 001/AlternativeCore.idr
rename to tests/derivation/infra/empty-body print 001/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 001/DerivedGen.idr b/tests/derivation/infra/empty-body print 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 001/DerivedGen.idr
rename to tests/derivation/infra/empty-body print 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 001/PrintDerivation.idr b/tests/derivation/infra/empty-body print 001/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 001/PrintDerivation.idr
rename to tests/derivation/infra/empty-body print 001/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 001/RunDerivedGen.idr b/tests/derivation/infra/empty-body print 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 001/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body print 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 001/derive.ipkg b/tests/derivation/infra/empty-body print 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 001/derive.ipkg
rename to tests/derivation/infra/empty-body print 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 001/expected b/tests/derivation/infra/empty-body print 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 001/expected
rename to tests/derivation/infra/empty-body print 001/expected
diff --git a/tests/gen-derivation/derivation/core/typealias con 003-neg/run b/tests/derivation/infra/empty-body print 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/typealias con 003-neg/run
rename to tests/derivation/infra/empty-body print 001/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 002/AlternativeCore.idr b/tests/derivation/infra/empty-body print 002/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 002/AlternativeCore.idr
rename to tests/derivation/infra/empty-body print 002/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 002/DerivedGen.idr b/tests/derivation/infra/empty-body print 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 002/DerivedGen.idr
rename to tests/derivation/infra/empty-body print 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 002/PrintDerivation.idr b/tests/derivation/infra/empty-body print 002/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 002/PrintDerivation.idr
rename to tests/derivation/infra/empty-body print 002/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 002/RunDerivedGen.idr b/tests/derivation/infra/empty-body print 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 002/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body print 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 002/derive.ipkg b/tests/derivation/infra/empty-body print 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 002/derive.ipkg
rename to tests/derivation/infra/empty-body print 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 002/expected b/tests/derivation/infra/empty-body print 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 002/expected
rename to tests/derivation/infra/empty-body print 002/expected
diff --git a/tests/gen-derivation/derivation/core/upstream-2983/run b/tests/derivation/infra/empty-body print 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/core/upstream-2983/run
rename to tests/derivation/infra/empty-body print 002/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 003/AlternativeCore.idr b/tests/derivation/infra/empty-body print 003/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 003/AlternativeCore.idr
rename to tests/derivation/infra/empty-body print 003/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 003/DerivedGen.idr b/tests/derivation/infra/empty-body print 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 003/DerivedGen.idr
rename to tests/derivation/infra/empty-body print 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 003/PrintDerivation.idr b/tests/derivation/infra/empty-body print 003/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 003/PrintDerivation.idr
rename to tests/derivation/infra/empty-body print 003/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 003/RunDerivedGen.idr b/tests/derivation/infra/empty-body print 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 003/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body print 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 003/derive.ipkg b/tests/derivation/infra/empty-body print 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 003/derive.ipkg
rename to tests/derivation/infra/empty-body print 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 003/expected b/tests/derivation/infra/empty-body print 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 003/expected
rename to tests/derivation/infra/empty-body print 003/expected
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-001/run b/tests/derivation/infra/empty-body print 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-001/run
rename to tests/derivation/infra/empty-body print 003/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 004/AlternativeCore.idr b/tests/derivation/infra/empty-body print 004/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 004/AlternativeCore.idr
rename to tests/derivation/infra/empty-body print 004/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 004/DerivedGen.idr b/tests/derivation/infra/empty-body print 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 004/DerivedGen.idr
rename to tests/derivation/infra/empty-body print 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 004/PrintDerivation.idr b/tests/derivation/infra/empty-body print 004/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 004/PrintDerivation.idr
rename to tests/derivation/infra/empty-body print 004/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 004/RunDerivedGen.idr b/tests/derivation/infra/empty-body print 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 004/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body print 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 004/derive.ipkg b/tests/derivation/infra/empty-body print 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 004/derive.ipkg
rename to tests/derivation/infra/empty-body print 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 004/expected b/tests/derivation/infra/empty-body print 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 004/expected
rename to tests/derivation/infra/empty-body print 004/expected
diff --git a/tests/gen-derivation/derivation/distribution/list-nat-002/run b/tests/derivation/infra/empty-body print 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/list-nat-002/run
rename to tests/derivation/infra/empty-body print 004/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 005/AlternativeCore.idr b/tests/derivation/infra/empty-body print 005/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 005/AlternativeCore.idr
rename to tests/derivation/infra/empty-body print 005/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 005/DerivedGen.idr b/tests/derivation/infra/empty-body print 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 005/DerivedGen.idr
rename to tests/derivation/infra/empty-body print 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 005/PrintDerivation.idr b/tests/derivation/infra/empty-body print 005/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 005/PrintDerivation.idr
rename to tests/derivation/infra/empty-body print 005/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 005/RunDerivedGen.idr b/tests/derivation/infra/empty-body print 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 005/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body print 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 005/derive.ipkg b/tests/derivation/infra/empty-body print 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 005/derive.ipkg
rename to tests/derivation/infra/empty-body print 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 005/expected b/tests/derivation/infra/empty-body print 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 005/expected
rename to tests/derivation/infra/empty-body print 005/expected
diff --git a/tests/gen-derivation/derivation/distribution/nats-001/run b/tests/derivation/infra/empty-body print 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/nats-001/run
rename to tests/derivation/infra/empty-body print 005/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 006/AlternativeCore.idr b/tests/derivation/infra/empty-body print 006/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 006/AlternativeCore.idr
rename to tests/derivation/infra/empty-body print 006/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 006/DerivedGen.idr b/tests/derivation/infra/empty-body print 006/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 006/DerivedGen.idr
rename to tests/derivation/infra/empty-body print 006/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 006/PrintDerivation.idr b/tests/derivation/infra/empty-body print 006/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 006/PrintDerivation.idr
rename to tests/derivation/infra/empty-body print 006/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 006/RunDerivedGen.idr b/tests/derivation/infra/empty-body print 006/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 006/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body print 006/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 006/derive.ipkg b/tests/derivation/infra/empty-body print 006/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 006/derive.ipkg
rename to tests/derivation/infra/empty-body print 006/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 006/expected b/tests/derivation/infra/empty-body print 006/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 006/expected
rename to tests/derivation/infra/empty-body print 006/expected
diff --git a/tests/gen-derivation/derivation/distribution/vect-nat-001/run b/tests/derivation/infra/empty-body print 006/run
similarity index 100%
rename from tests/gen-derivation/derivation/distribution/vect-nat-001/run
rename to tests/derivation/infra/empty-body print 006/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 007/AlternativeCore.idr b/tests/derivation/infra/empty-body print 007/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 007/AlternativeCore.idr
rename to tests/derivation/infra/empty-body print 007/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 007/DerivedGen.idr b/tests/derivation/infra/empty-body print 007/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 007/DerivedGen.idr
rename to tests/derivation/infra/empty-body print 007/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 007/PrintDerivation.idr b/tests/derivation/infra/empty-body print 007/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 007/PrintDerivation.idr
rename to tests/derivation/infra/empty-body print 007/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 007/RunDerivedGen.idr b/tests/derivation/infra/empty-body print 007/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 007/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body print 007/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 007/derive.ipkg b/tests/derivation/infra/empty-body print 007/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 007/derive.ipkg
rename to tests/derivation/infra/empty-body print 007/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 007/expected b/tests/derivation/infra/empty-body print 007/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 007/expected
rename to tests/derivation/infra/empty-body print 007/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 001/run b/tests/derivation/infra/empty-body print 007/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 001/run
rename to tests/derivation/infra/empty-body print 007/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 008/AlternativeCore.idr b/tests/derivation/infra/empty-body print 008/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 008/AlternativeCore.idr
rename to tests/derivation/infra/empty-body print 008/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 008/DerivedGen.idr b/tests/derivation/infra/empty-body print 008/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 008/DerivedGen.idr
rename to tests/derivation/infra/empty-body print 008/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 008/PrintDerivation.idr b/tests/derivation/infra/empty-body print 008/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 008/PrintDerivation.idr
rename to tests/derivation/infra/empty-body print 008/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 008/RunDerivedGen.idr b/tests/derivation/infra/empty-body print 008/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 008/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body print 008/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 008/derive.ipkg b/tests/derivation/infra/empty-body print 008/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 008/derive.ipkg
rename to tests/derivation/infra/empty-body print 008/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 008/expected b/tests/derivation/infra/empty-body print 008/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 008/expected
rename to tests/derivation/infra/empty-body print 008/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 002/run b/tests/derivation/infra/empty-body print 008/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 002/run
rename to tests/derivation/infra/empty-body print 008/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 001/AlternativeCore.idr b/tests/derivation/infra/empty-body run 001/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 001/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 001/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 001/DerivedGen.idr b/tests/derivation/infra/empty-body run 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 001/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 001/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 001/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 001/derive.ipkg b/tests/derivation/infra/empty-body run 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 001/derive.ipkg
rename to tests/derivation/infra/empty-body run 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 001/expected b/tests/derivation/infra/empty-body run 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 001/expected
rename to tests/derivation/infra/empty-body run 001/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 003/run b/tests/derivation/infra/empty-body run 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 003/run
rename to tests/derivation/infra/empty-body run 001/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 002/AlternativeCore.idr b/tests/derivation/infra/empty-body run 002/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 002/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 002/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 002/DerivedGen.idr b/tests/derivation/infra/empty-body run 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 002/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 002/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 002/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 002/derive.ipkg b/tests/derivation/infra/empty-body run 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 002/derive.ipkg
rename to tests/derivation/infra/empty-body run 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 002/expected b/tests/derivation/infra/empty-body run 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 002/expected
rename to tests/derivation/infra/empty-body run 002/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 004/run b/tests/derivation/infra/empty-body run 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 004/run
rename to tests/derivation/infra/empty-body run 002/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 003/AlternativeCore.idr b/tests/derivation/infra/empty-body run 003/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 003/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 003/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 003/DerivedGen.idr b/tests/derivation/infra/empty-body run 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 003/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 003/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 003/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 003/derive.ipkg b/tests/derivation/infra/empty-body run 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 003/derive.ipkg
rename to tests/derivation/infra/empty-body run 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 003/expected b/tests/derivation/infra/empty-body run 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 003/expected
rename to tests/derivation/infra/empty-body run 003/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 005/run b/tests/derivation/infra/empty-body run 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 005/run
rename to tests/derivation/infra/empty-body run 003/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 004/AlternativeCore.idr b/tests/derivation/infra/empty-body run 004/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 004/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 004/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 004/DerivedGen.idr b/tests/derivation/infra/empty-body run 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 004/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 004/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 004/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 004/derive.ipkg b/tests/derivation/infra/empty-body run 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 004/derive.ipkg
rename to tests/derivation/infra/empty-body run 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 004/expected b/tests/derivation/infra/empty-body run 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 004/expected
rename to tests/derivation/infra/empty-body run 004/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 006/run b/tests/derivation/infra/empty-body run 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 006/run
rename to tests/derivation/infra/empty-body run 004/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 005/AlternativeCore.idr b/tests/derivation/infra/empty-body run 005/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 005/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 005/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 005/DerivedGen.idr b/tests/derivation/infra/empty-body run 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 005/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 005/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 005/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 005/derive.ipkg b/tests/derivation/infra/empty-body run 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 005/derive.ipkg
rename to tests/derivation/infra/empty-body run 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 005/expected b/tests/derivation/infra/empty-body run 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 005/expected
rename to tests/derivation/infra/empty-body run 005/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 007/run b/tests/derivation/infra/empty-body run 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 007/run
rename to tests/derivation/infra/empty-body run 005/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 006/AlternativeCore.idr b/tests/derivation/infra/empty-body run 006/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 006/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 006/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 006/DerivedGen.idr b/tests/derivation/infra/empty-body run 006/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 006/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 006/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 006/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 006/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 006/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 006/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 006/derive.ipkg b/tests/derivation/infra/empty-body run 006/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 006/derive.ipkg
rename to tests/derivation/infra/empty-body run 006/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 006/expected b/tests/derivation/infra/empty-body run 006/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 006/expected
rename to tests/derivation/infra/empty-body run 006/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body print 008/run b/tests/derivation/infra/empty-body run 006/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body print 008/run
rename to tests/derivation/infra/empty-body run 006/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 007/AlternativeCore.idr b/tests/derivation/infra/empty-body run 007/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 007/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 007/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 007/DerivedGen.idr b/tests/derivation/infra/empty-body run 007/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 007/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 007/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 007/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 007/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 007/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 007/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 007/derive.ipkg b/tests/derivation/infra/empty-body run 007/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 007/derive.ipkg
rename to tests/derivation/infra/empty-body run 007/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 007/expected b/tests/derivation/infra/empty-body run 007/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 007/expected
rename to tests/derivation/infra/empty-body run 007/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 001/run b/tests/derivation/infra/empty-body run 007/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 001/run
rename to tests/derivation/infra/empty-body run 007/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 008/AlternativeCore.idr b/tests/derivation/infra/empty-body run 008/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 008/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 008/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 008/DerivedGen.idr b/tests/derivation/infra/empty-body run 008/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 008/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 008/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 008/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 008/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 008/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 008/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 008/derive.ipkg b/tests/derivation/infra/empty-body run 008/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 008/derive.ipkg
rename to tests/derivation/infra/empty-body run 008/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 008/expected b/tests/derivation/infra/empty-body run 008/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 008/expected
rename to tests/derivation/infra/empty-body run 008/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 002/run b/tests/derivation/infra/empty-body run 008/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 002/run
rename to tests/derivation/infra/empty-body run 008/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 009/AlternativeCore.idr b/tests/derivation/infra/empty-body run 009/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 009/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 009/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 009/DerivedGen.idr b/tests/derivation/infra/empty-body run 009/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 009/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 009/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 009/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 009/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 009/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 009/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 009/derive.ipkg b/tests/derivation/infra/empty-body run 009/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 009/derive.ipkg
rename to tests/derivation/infra/empty-body run 009/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 009/expected b/tests/derivation/infra/empty-body run 009/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 009/expected
rename to tests/derivation/infra/empty-body run 009/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 003/run b/tests/derivation/infra/empty-body run 009/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 003/run
rename to tests/derivation/infra/empty-body run 009/run
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 010/AlternativeCore.idr b/tests/derivation/infra/empty-body run 010/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 010/AlternativeCore.idr
rename to tests/derivation/infra/empty-body run 010/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 010/DerivedGen.idr b/tests/derivation/infra/empty-body run 010/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 010/DerivedGen.idr
rename to tests/derivation/infra/empty-body run 010/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 010/RunDerivedGen.idr b/tests/derivation/infra/empty-body run 010/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 010/RunDerivedGen.idr
rename to tests/derivation/infra/empty-body run 010/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 010/derive.ipkg b/tests/derivation/infra/empty-body run 010/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 010/derive.ipkg
rename to tests/derivation/infra/empty-body run 010/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 010/expected b/tests/derivation/infra/empty-body run 010/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 010/expected
rename to tests/derivation/infra/empty-body run 010/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 004/run b/tests/derivation/infra/empty-body run 010/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 004/run
rename to tests/derivation/infra/empty-body run 010/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 001/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 001/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 001/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 001/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 001/DerivedGen.idr b/tests/derivation/infra/empty-cons print 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 001/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 001/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 001/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 001/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 001/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 001/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 001/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 001/derive.ipkg b/tests/derivation/infra/empty-cons print 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 001/derive.ipkg
rename to tests/derivation/infra/empty-cons print 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 001/expected b/tests/derivation/infra/empty-cons print 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 001/expected
rename to tests/derivation/infra/empty-cons print 001/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 005/run b/tests/derivation/infra/empty-cons print 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 005/run
rename to tests/derivation/infra/empty-cons print 001/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 002/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 002/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 002/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 002/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 002/DerivedGen.idr b/tests/derivation/infra/empty-cons print 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 002/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 002/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 002/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 002/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 002/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 002/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 002/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 002/derive.ipkg b/tests/derivation/infra/empty-cons print 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 002/derive.ipkg
rename to tests/derivation/infra/empty-cons print 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 002/expected b/tests/derivation/infra/empty-cons print 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 002/expected
rename to tests/derivation/infra/empty-cons print 002/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 006/run b/tests/derivation/infra/empty-cons print 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 006/run
rename to tests/derivation/infra/empty-cons print 002/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 003/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 003/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 003/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 003/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 003/DerivedGen.idr b/tests/derivation/infra/empty-cons print 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 003/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 003/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 003/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 003/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 003/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 003/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 003/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 003/derive.ipkg b/tests/derivation/infra/empty-cons print 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 003/derive.ipkg
rename to tests/derivation/infra/empty-cons print 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 003/expected b/tests/derivation/infra/empty-cons print 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 003/expected
rename to tests/derivation/infra/empty-cons print 003/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 007/run b/tests/derivation/infra/empty-cons print 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 007/run
rename to tests/derivation/infra/empty-cons print 003/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 004/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 004/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 004/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 004/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 004/DerivedGen.idr b/tests/derivation/infra/empty-cons print 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 004/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 004/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 004/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 004/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 004/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 004/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 004/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 004/derive.ipkg b/tests/derivation/infra/empty-cons print 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 004/derive.ipkg
rename to tests/derivation/infra/empty-cons print 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 004/expected b/tests/derivation/infra/empty-cons print 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 004/expected
rename to tests/derivation/infra/empty-cons print 004/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 008/run b/tests/derivation/infra/empty-cons print 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 008/run
rename to tests/derivation/infra/empty-cons print 004/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 005/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 005/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 005/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 005/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 005/DerivedGen.idr b/tests/derivation/infra/empty-cons print 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 005/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 005/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 005/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 005/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 005/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 005/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 005/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 005/derive.ipkg b/tests/derivation/infra/empty-cons print 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 005/derive.ipkg
rename to tests/derivation/infra/empty-cons print 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 005/expected b/tests/derivation/infra/empty-cons print 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 005/expected
rename to tests/derivation/infra/empty-cons print 005/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 009/run b/tests/derivation/infra/empty-cons print 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 009/run
rename to tests/derivation/infra/empty-cons print 005/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 006/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 006/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 006/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 006/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 006/DerivedGen.idr b/tests/derivation/infra/empty-cons print 006/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 006/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 006/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 006/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 006/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 006/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 006/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 006/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 006/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 006/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 006/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 006/derive.ipkg b/tests/derivation/infra/empty-cons print 006/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 006/derive.ipkg
rename to tests/derivation/infra/empty-cons print 006/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 006/expected b/tests/derivation/infra/empty-cons print 006/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 006/expected
rename to tests/derivation/infra/empty-cons print 006/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-body run 010/run b/tests/derivation/infra/empty-cons print 006/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-body run 010/run
rename to tests/derivation/infra/empty-cons print 006/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 007/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 007/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 007/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 007/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 007/DerivedGen.idr b/tests/derivation/infra/empty-cons print 007/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 007/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 007/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 007/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 007/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 007/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 007/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 007/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 007/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 007/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 007/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 007/derive.ipkg b/tests/derivation/infra/empty-cons print 007/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 007/derive.ipkg
rename to tests/derivation/infra/empty-cons print 007/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 007/expected b/tests/derivation/infra/empty-cons print 007/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 007/expected
rename to tests/derivation/infra/empty-cons print 007/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 001/run b/tests/derivation/infra/empty-cons print 007/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 001/run
rename to tests/derivation/infra/empty-cons print 007/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 008/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 008/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 008/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 008/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 008/DerivedGen.idr b/tests/derivation/infra/empty-cons print 008/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 008/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 008/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 008/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 008/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 008/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 008/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 008/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 008/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 008/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 008/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 008/derive.ipkg b/tests/derivation/infra/empty-cons print 008/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 008/derive.ipkg
rename to tests/derivation/infra/empty-cons print 008/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 008/expected b/tests/derivation/infra/empty-cons print 008/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 008/expected
rename to tests/derivation/infra/empty-cons print 008/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 002/run b/tests/derivation/infra/empty-cons print 008/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 002/run
rename to tests/derivation/infra/empty-cons print 008/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 009/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 009/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 009/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 009/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 009/DerivedGen.idr b/tests/derivation/infra/empty-cons print 009/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 009/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 009/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 009/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 009/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 009/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 009/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 009/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 009/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 009/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 009/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 009/derive.ipkg b/tests/derivation/infra/empty-cons print 009/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 009/derive.ipkg
rename to tests/derivation/infra/empty-cons print 009/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 009/expected b/tests/derivation/infra/empty-cons print 009/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 009/expected
rename to tests/derivation/infra/empty-cons print 009/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 003/run b/tests/derivation/infra/empty-cons print 009/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 003/run
rename to tests/derivation/infra/empty-cons print 009/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 010/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 010/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 010/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 010/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 010/DerivedGen.idr b/tests/derivation/infra/empty-cons print 010/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 010/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 010/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 010/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 010/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 010/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 010/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 010/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 010/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 010/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 010/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 010/derive.ipkg b/tests/derivation/infra/empty-cons print 010/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 010/derive.ipkg
rename to tests/derivation/infra/empty-cons print 010/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 010/expected b/tests/derivation/infra/empty-cons print 010/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 010/expected
rename to tests/derivation/infra/empty-cons print 010/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 004/run b/tests/derivation/infra/empty-cons print 010/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 004/run
rename to tests/derivation/infra/empty-cons print 010/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 011/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 011/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 011/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 011/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 011/DerivedGen.idr b/tests/derivation/infra/empty-cons print 011/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 011/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 011/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 011/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 011/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 011/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 011/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 011/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 011/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 011/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 011/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 011/derive.ipkg b/tests/derivation/infra/empty-cons print 011/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 011/derive.ipkg
rename to tests/derivation/infra/empty-cons print 011/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 011/expected b/tests/derivation/infra/empty-cons print 011/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 011/expected
rename to tests/derivation/infra/empty-cons print 011/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 005/run b/tests/derivation/infra/empty-cons print 011/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 005/run
rename to tests/derivation/infra/empty-cons print 011/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 012/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 012/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 012/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 012/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 012/DerivedGen.idr b/tests/derivation/infra/empty-cons print 012/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 012/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 012/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 012/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 012/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 012/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 012/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 012/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 012/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 012/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 012/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 012/derive.ipkg b/tests/derivation/infra/empty-cons print 012/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 012/derive.ipkg
rename to tests/derivation/infra/empty-cons print 012/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 012/expected b/tests/derivation/infra/empty-cons print 012/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 012/expected
rename to tests/derivation/infra/empty-cons print 012/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 006/run b/tests/derivation/infra/empty-cons print 012/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 006/run
rename to tests/derivation/infra/empty-cons print 012/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 013/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 013/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 013/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 013/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 013/DerivedGen.idr b/tests/derivation/infra/empty-cons print 013/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 013/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 013/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 013/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 013/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 013/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 013/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 013/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 013/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 013/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 013/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 013/derive.ipkg b/tests/derivation/infra/empty-cons print 013/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 013/derive.ipkg
rename to tests/derivation/infra/empty-cons print 013/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 013/expected b/tests/derivation/infra/empty-cons print 013/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 013/expected
rename to tests/derivation/infra/empty-cons print 013/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 007/run b/tests/derivation/infra/empty-cons print 013/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 007/run
rename to tests/derivation/infra/empty-cons print 013/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 014/AlternativeCore.idr b/tests/derivation/infra/empty-cons print 014/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 014/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons print 014/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 014/DerivedGen.idr b/tests/derivation/infra/empty-cons print 014/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 014/DerivedGen.idr
rename to tests/derivation/infra/empty-cons print 014/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 014/PrintDerivation.idr b/tests/derivation/infra/empty-cons print 014/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 014/PrintDerivation.idr
rename to tests/derivation/infra/empty-cons print 014/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 014/RunDerivedGen.idr b/tests/derivation/infra/empty-cons print 014/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 014/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons print 014/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 014/derive.ipkg b/tests/derivation/infra/empty-cons print 014/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 014/derive.ipkg
rename to tests/derivation/infra/empty-cons print 014/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 014/expected b/tests/derivation/infra/empty-cons print 014/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 014/expected
rename to tests/derivation/infra/empty-cons print 014/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 008/run b/tests/derivation/infra/empty-cons print 014/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 008/run
rename to tests/derivation/infra/empty-cons print 014/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 001/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 001/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 001/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 001/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 001/DerivedGen.idr b/tests/derivation/infra/empty-cons run 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 001/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 001/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 001/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 001/derive.ipkg b/tests/derivation/infra/empty-cons run 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 001/derive.ipkg
rename to tests/derivation/infra/empty-cons run 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 001/expected b/tests/derivation/infra/empty-cons run 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 001/expected
rename to tests/derivation/infra/empty-cons run 001/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 009/run b/tests/derivation/infra/empty-cons run 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 009/run
rename to tests/derivation/infra/empty-cons run 001/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 002/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 002/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 002/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 002/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 002/DerivedGen.idr b/tests/derivation/infra/empty-cons run 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 002/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 002/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 002/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 002/derive.ipkg b/tests/derivation/infra/empty-cons run 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 002/derive.ipkg
rename to tests/derivation/infra/empty-cons run 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 002/expected b/tests/derivation/infra/empty-cons run 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 002/expected
rename to tests/derivation/infra/empty-cons run 002/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 010/run b/tests/derivation/infra/empty-cons run 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 010/run
rename to tests/derivation/infra/empty-cons run 002/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 003/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 003/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 003/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 003/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 003/DerivedGen.idr b/tests/derivation/infra/empty-cons run 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 003/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 003/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 003/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 003/derive.ipkg b/tests/derivation/infra/empty-cons run 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 003/derive.ipkg
rename to tests/derivation/infra/empty-cons run 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 003/expected b/tests/derivation/infra/empty-cons run 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 003/expected
rename to tests/derivation/infra/empty-cons run 003/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 011/run b/tests/derivation/infra/empty-cons run 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 011/run
rename to tests/derivation/infra/empty-cons run 003/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 004/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 004/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 004/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 004/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 004/DerivedGen.idr b/tests/derivation/infra/empty-cons run 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 004/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 004/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 004/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 004/derive.ipkg b/tests/derivation/infra/empty-cons run 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 004/derive.ipkg
rename to tests/derivation/infra/empty-cons run 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 004/expected b/tests/derivation/infra/empty-cons run 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 004/expected
rename to tests/derivation/infra/empty-cons run 004/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 012/run b/tests/derivation/infra/empty-cons run 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 012/run
rename to tests/derivation/infra/empty-cons run 004/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 005/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 005/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 005/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 005/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 005/DerivedGen.idr b/tests/derivation/infra/empty-cons run 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 005/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 005/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 005/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 005/derive.ipkg b/tests/derivation/infra/empty-cons run 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 005/derive.ipkg
rename to tests/derivation/infra/empty-cons run 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 005/expected b/tests/derivation/infra/empty-cons run 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 005/expected
rename to tests/derivation/infra/empty-cons run 005/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 013/run b/tests/derivation/infra/empty-cons run 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 013/run
rename to tests/derivation/infra/empty-cons run 005/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 006/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 006/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 006/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 006/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 006/DerivedGen.idr b/tests/derivation/infra/empty-cons run 006/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 006/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 006/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 006/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 006/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 006/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 006/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 006/derive.ipkg b/tests/derivation/infra/empty-cons run 006/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 006/derive.ipkg
rename to tests/derivation/infra/empty-cons run 006/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 006/expected b/tests/derivation/infra/empty-cons run 006/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 006/expected
rename to tests/derivation/infra/empty-cons run 006/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons print 014/run b/tests/derivation/infra/empty-cons run 006/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons print 014/run
rename to tests/derivation/infra/empty-cons run 006/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 007/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 007/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 007/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 007/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 007/DerivedGen.idr b/tests/derivation/infra/empty-cons run 007/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 007/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 007/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 007/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 007/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 007/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 007/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 007/derive.ipkg b/tests/derivation/infra/empty-cons run 007/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 007/derive.ipkg
rename to tests/derivation/infra/empty-cons run 007/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 007/expected b/tests/derivation/infra/empty-cons run 007/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 007/expected
rename to tests/derivation/infra/empty-cons run 007/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 001/run b/tests/derivation/infra/empty-cons run 007/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 001/run
rename to tests/derivation/infra/empty-cons run 007/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 008/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 008/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 008/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 008/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 008/DerivedGen.idr b/tests/derivation/infra/empty-cons run 008/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 008/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 008/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 008/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 008/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 008/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 008/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 008/derive.ipkg b/tests/derivation/infra/empty-cons run 008/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 008/derive.ipkg
rename to tests/derivation/infra/empty-cons run 008/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 008/expected b/tests/derivation/infra/empty-cons run 008/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 008/expected
rename to tests/derivation/infra/empty-cons run 008/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 002/run b/tests/derivation/infra/empty-cons run 008/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 002/run
rename to tests/derivation/infra/empty-cons run 008/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 009/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 009/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 009/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 009/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 009/DerivedGen.idr b/tests/derivation/infra/empty-cons run 009/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 009/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 009/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 009/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 009/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 009/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 009/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 009/derive.ipkg b/tests/derivation/infra/empty-cons run 009/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 009/derive.ipkg
rename to tests/derivation/infra/empty-cons run 009/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 009/expected b/tests/derivation/infra/empty-cons run 009/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 009/expected
rename to tests/derivation/infra/empty-cons run 009/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 003/run b/tests/derivation/infra/empty-cons run 009/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 003/run
rename to tests/derivation/infra/empty-cons run 009/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 010/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 010/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 010/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 010/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 010/DerivedGen.idr b/tests/derivation/infra/empty-cons run 010/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 010/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 010/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 010/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 010/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 010/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 010/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 010/derive.ipkg b/tests/derivation/infra/empty-cons run 010/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 010/derive.ipkg
rename to tests/derivation/infra/empty-cons run 010/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 010/expected b/tests/derivation/infra/empty-cons run 010/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 010/expected
rename to tests/derivation/infra/empty-cons run 010/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 004/run b/tests/derivation/infra/empty-cons run 010/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 004/run
rename to tests/derivation/infra/empty-cons run 010/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 011/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 011/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 011/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 011/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 011/DerivedGen.idr b/tests/derivation/infra/empty-cons run 011/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 011/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 011/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 011/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 011/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 011/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 011/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 011/derive.ipkg b/tests/derivation/infra/empty-cons run 011/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 011/derive.ipkg
rename to tests/derivation/infra/empty-cons run 011/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 011/expected b/tests/derivation/infra/empty-cons run 011/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 011/expected
rename to tests/derivation/infra/empty-cons run 011/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 005/run b/tests/derivation/infra/empty-cons run 011/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 005/run
rename to tests/derivation/infra/empty-cons run 011/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 012/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 012/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 012/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 012/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 012/DerivedGen.idr b/tests/derivation/infra/empty-cons run 012/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 012/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 012/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 012/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 012/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 012/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 012/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 012/derive.ipkg b/tests/derivation/infra/empty-cons run 012/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 012/derive.ipkg
rename to tests/derivation/infra/empty-cons run 012/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 012/expected b/tests/derivation/infra/empty-cons run 012/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 012/expected
rename to tests/derivation/infra/empty-cons run 012/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 006/run b/tests/derivation/infra/empty-cons run 012/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 006/run
rename to tests/derivation/infra/empty-cons run 012/run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 013/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 013/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 013/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 013/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 013/DerivedGen.idr b/tests/derivation/infra/empty-cons run 013/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 013/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 013/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 013/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 013/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 013/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 013/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 013/derive.ipkg b/tests/derivation/infra/empty-cons run 013/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 013/derive.ipkg
rename to tests/derivation/infra/empty-cons run 013/derive.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/dont-run b/tests/derivation/infra/empty-cons run 013/dont-run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001-shdw/dont-run
rename to tests/derivation/infra/empty-cons run 013/dont-run
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 013/expected b/tests/derivation/infra/empty-cons run 013/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 013/expected
rename to tests/derivation/infra/empty-cons run 013/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 014/AlternativeCore.idr b/tests/derivation/infra/empty-cons run 014/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 014/AlternativeCore.idr
rename to tests/derivation/infra/empty-cons run 014/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 014/DerivedGen.idr b/tests/derivation/infra/empty-cons run 014/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 014/DerivedGen.idr
rename to tests/derivation/infra/empty-cons run 014/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 014/RunDerivedGen.idr b/tests/derivation/infra/empty-cons run 014/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 014/RunDerivedGen.idr
rename to tests/derivation/infra/empty-cons run 014/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 014/derive.ipkg b/tests/derivation/infra/empty-cons run 014/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 014/derive.ipkg
rename to tests/derivation/infra/empty-cons run 014/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 014/expected b/tests/derivation/infra/empty-cons run 014/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 014/expected
rename to tests/derivation/infra/empty-cons run 014/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 007/run b/tests/derivation/infra/empty-cons run 014/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 007/run
rename to tests/derivation/infra/empty-cons run 014/run
diff --git a/tests/gen-derivation/derivation/infra/ext print 001/AlternativeCore.idr b/tests/derivation/infra/ext print 001/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 001/AlternativeCore.idr
rename to tests/derivation/infra/ext print 001/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 001/DerivedGen.idr b/tests/derivation/infra/ext print 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 001/DerivedGen.idr
rename to tests/derivation/infra/ext print 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 001/PrintDerivation.idr b/tests/derivation/infra/ext print 001/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 001/PrintDerivation.idr
rename to tests/derivation/infra/ext print 001/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 001/RunDerivedGen.idr b/tests/derivation/infra/ext print 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 001/RunDerivedGen.idr
rename to tests/derivation/infra/ext print 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 001/derive.ipkg b/tests/derivation/infra/ext print 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 001/derive.ipkg
rename to tests/derivation/infra/ext print 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/ext print 001/expected b/tests/derivation/infra/ext print 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 001/expected
rename to tests/derivation/infra/ext print 001/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 008/run b/tests/derivation/infra/ext print 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 008/run
rename to tests/derivation/infra/ext print 001/run
diff --git a/tests/gen-derivation/derivation/infra/ext print 002/AlternativeCore.idr b/tests/derivation/infra/ext print 002/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 002/AlternativeCore.idr
rename to tests/derivation/infra/ext print 002/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 002/DerivedGen.idr b/tests/derivation/infra/ext print 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 002/DerivedGen.idr
rename to tests/derivation/infra/ext print 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 002/PrintDerivation.idr b/tests/derivation/infra/ext print 002/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 002/PrintDerivation.idr
rename to tests/derivation/infra/ext print 002/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 002/RunDerivedGen.idr b/tests/derivation/infra/ext print 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 002/RunDerivedGen.idr
rename to tests/derivation/infra/ext print 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 002/derive.ipkg b/tests/derivation/infra/ext print 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 002/derive.ipkg
rename to tests/derivation/infra/ext print 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/ext print 002/expected b/tests/derivation/infra/ext print 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 002/expected
rename to tests/derivation/infra/ext print 002/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 009/run b/tests/derivation/infra/ext print 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 009/run
rename to tests/derivation/infra/ext print 002/run
diff --git a/tests/gen-derivation/derivation/infra/ext print 003/AlternativeCore.idr b/tests/derivation/infra/ext print 003/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 003/AlternativeCore.idr
rename to tests/derivation/infra/ext print 003/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 003/DerivedGen.idr b/tests/derivation/infra/ext print 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 003/DerivedGen.idr
rename to tests/derivation/infra/ext print 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 003/PrintDerivation.idr b/tests/derivation/infra/ext print 003/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 003/PrintDerivation.idr
rename to tests/derivation/infra/ext print 003/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 003/RunDerivedGen.idr b/tests/derivation/infra/ext print 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 003/RunDerivedGen.idr
rename to tests/derivation/infra/ext print 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 003/derive.ipkg b/tests/derivation/infra/ext print 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 003/derive.ipkg
rename to tests/derivation/infra/ext print 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/ext print 003/expected b/tests/derivation/infra/ext print 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 003/expected
rename to tests/derivation/infra/ext print 003/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 010/run b/tests/derivation/infra/ext print 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 010/run
rename to tests/derivation/infra/ext print 003/run
diff --git a/tests/gen-derivation/derivation/infra/ext print 004/AlternativeCore.idr b/tests/derivation/infra/ext print 004/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 004/AlternativeCore.idr
rename to tests/derivation/infra/ext print 004/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 004/DerivedGen.idr b/tests/derivation/infra/ext print 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 004/DerivedGen.idr
rename to tests/derivation/infra/ext print 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 004/PrintDerivation.idr b/tests/derivation/infra/ext print 004/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 004/PrintDerivation.idr
rename to tests/derivation/infra/ext print 004/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 004/RunDerivedGen.idr b/tests/derivation/infra/ext print 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 004/RunDerivedGen.idr
rename to tests/derivation/infra/ext print 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext print 004/derive.ipkg b/tests/derivation/infra/ext print 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 004/derive.ipkg
rename to tests/derivation/infra/ext print 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/ext print 004/expected b/tests/derivation/infra/ext print 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 004/expected
rename to tests/derivation/infra/ext print 004/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 011/run b/tests/derivation/infra/ext print 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 011/run
rename to tests/derivation/infra/ext print 004/run
diff --git a/tests/gen-derivation/derivation/infra/ext run 001/AlternativeCore.idr b/tests/derivation/infra/ext run 001/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 001/AlternativeCore.idr
rename to tests/derivation/infra/ext run 001/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 001/DerivedGen.idr b/tests/derivation/infra/ext run 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 001/DerivedGen.idr
rename to tests/derivation/infra/ext run 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 001/RunDerivedGen.idr b/tests/derivation/infra/ext run 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 001/RunDerivedGen.idr
rename to tests/derivation/infra/ext run 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 001/derive.ipkg b/tests/derivation/infra/ext run 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 001/derive.ipkg
rename to tests/derivation/infra/ext run 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/ext run 001/expected b/tests/derivation/infra/ext run 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 001/expected
rename to tests/derivation/infra/ext run 001/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 012/run b/tests/derivation/infra/ext run 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 012/run
rename to tests/derivation/infra/ext run 001/run
diff --git a/tests/gen-derivation/derivation/infra/ext run 002/AlternativeCore.idr b/tests/derivation/infra/ext run 002/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 002/AlternativeCore.idr
rename to tests/derivation/infra/ext run 002/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 002/DerivedGen.idr b/tests/derivation/infra/ext run 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 002/DerivedGen.idr
rename to tests/derivation/infra/ext run 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 002/RunDerivedGen.idr b/tests/derivation/infra/ext run 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 002/RunDerivedGen.idr
rename to tests/derivation/infra/ext run 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 002/derive.ipkg b/tests/derivation/infra/ext run 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 002/derive.ipkg
rename to tests/derivation/infra/ext run 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/ext run 002/expected b/tests/derivation/infra/ext run 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 002/expected
rename to tests/derivation/infra/ext run 002/expected
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 014/run b/tests/derivation/infra/ext run 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 014/run
rename to tests/derivation/infra/ext run 002/run
diff --git a/tests/gen-derivation/derivation/infra/ext run 003/AlternativeCore.idr b/tests/derivation/infra/ext run 003/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 003/AlternativeCore.idr
rename to tests/derivation/infra/ext run 003/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 003/DerivedGen.idr b/tests/derivation/infra/ext run 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 003/DerivedGen.idr
rename to tests/derivation/infra/ext run 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 003/RunDerivedGen.idr b/tests/derivation/infra/ext run 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 003/RunDerivedGen.idr
rename to tests/derivation/infra/ext run 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 003/derive.ipkg b/tests/derivation/infra/ext run 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 003/derive.ipkg
rename to tests/derivation/infra/ext run 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/ext run 003/expected b/tests/derivation/infra/ext run 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 003/expected
rename to tests/derivation/infra/ext run 003/expected
diff --git a/tests/gen-derivation/derivation/infra/ext print 001/run b/tests/derivation/infra/ext run 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 001/run
rename to tests/derivation/infra/ext run 003/run
diff --git a/tests/gen-derivation/derivation/infra/ext run 004/AlternativeCore.idr b/tests/derivation/infra/ext run 004/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 004/AlternativeCore.idr
rename to tests/derivation/infra/ext run 004/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 004/DerivedGen.idr b/tests/derivation/infra/ext run 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 004/DerivedGen.idr
rename to tests/derivation/infra/ext run 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 004/RunDerivedGen.idr b/tests/derivation/infra/ext run 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 004/RunDerivedGen.idr
rename to tests/derivation/infra/ext run 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/ext run 004/derive.ipkg b/tests/derivation/infra/ext run 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 004/derive.ipkg
rename to tests/derivation/infra/ext run 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/ext run 004/expected b/tests/derivation/infra/ext run 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 004/expected
rename to tests/derivation/infra/ext run 004/expected
diff --git a/tests/gen-derivation/derivation/infra/ext print 002/run b/tests/derivation/infra/ext run 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 002/run
rename to tests/derivation/infra/ext run 004/run
diff --git a/tests/gen-derivation/derivation/infra/self print 001/AlternativeCore.idr b/tests/derivation/infra/self print 001/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 001/AlternativeCore.idr
rename to tests/derivation/infra/self print 001/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 001/DerivedGen.idr b/tests/derivation/infra/self print 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 001/DerivedGen.idr
rename to tests/derivation/infra/self print 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 001/PrintDerivation.idr b/tests/derivation/infra/self print 001/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 001/PrintDerivation.idr
rename to tests/derivation/infra/self print 001/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 001/RunDerivedGen.idr b/tests/derivation/infra/self print 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 001/RunDerivedGen.idr
rename to tests/derivation/infra/self print 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 001/derive.ipkg b/tests/derivation/infra/self print 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 001/derive.ipkg
rename to tests/derivation/infra/self print 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self print 001/expected b/tests/derivation/infra/self print 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 001/expected
rename to tests/derivation/infra/self print 001/expected
diff --git a/tests/gen-derivation/derivation/infra/ext print 003/run b/tests/derivation/infra/self print 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 003/run
rename to tests/derivation/infra/self print 001/run
diff --git a/tests/gen-derivation/derivation/infra/self print 002/AlternativeCore.idr b/tests/derivation/infra/self print 002/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 002/AlternativeCore.idr
rename to tests/derivation/infra/self print 002/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 002/DerivedGen.idr b/tests/derivation/infra/self print 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 002/DerivedGen.idr
rename to tests/derivation/infra/self print 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 002/PrintDerivation.idr b/tests/derivation/infra/self print 002/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 002/PrintDerivation.idr
rename to tests/derivation/infra/self print 002/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 002/RunDerivedGen.idr b/tests/derivation/infra/self print 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 002/RunDerivedGen.idr
rename to tests/derivation/infra/self print 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 002/derive.ipkg b/tests/derivation/infra/self print 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 002/derive.ipkg
rename to tests/derivation/infra/self print 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self print 002/expected b/tests/derivation/infra/self print 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 002/expected
rename to tests/derivation/infra/self print 002/expected
diff --git a/tests/gen-derivation/derivation/infra/ext print 004/run b/tests/derivation/infra/self print 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext print 004/run
rename to tests/derivation/infra/self print 002/run
diff --git a/tests/gen-derivation/derivation/infra/self print 003/AlternativeCore.idr b/tests/derivation/infra/self print 003/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 003/AlternativeCore.idr
rename to tests/derivation/infra/self print 003/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 003/DerivedGen.idr b/tests/derivation/infra/self print 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 003/DerivedGen.idr
rename to tests/derivation/infra/self print 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 003/PrintDerivation.idr b/tests/derivation/infra/self print 003/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 003/PrintDerivation.idr
rename to tests/derivation/infra/self print 003/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 003/RunDerivedGen.idr b/tests/derivation/infra/self print 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 003/RunDerivedGen.idr
rename to tests/derivation/infra/self print 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 003/derive.ipkg b/tests/derivation/infra/self print 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 003/derive.ipkg
rename to tests/derivation/infra/self print 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self print 003/expected b/tests/derivation/infra/self print 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 003/expected
rename to tests/derivation/infra/self print 003/expected
diff --git a/tests/gen-derivation/derivation/infra/ext run 001/run b/tests/derivation/infra/self print 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 001/run
rename to tests/derivation/infra/self print 003/run
diff --git a/tests/gen-derivation/derivation/infra/self print 004/AlternativeCore.idr b/tests/derivation/infra/self print 004/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 004/AlternativeCore.idr
rename to tests/derivation/infra/self print 004/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 004/DerivedGen.idr b/tests/derivation/infra/self print 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 004/DerivedGen.idr
rename to tests/derivation/infra/self print 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 004/PrintDerivation.idr b/tests/derivation/infra/self print 004/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 004/PrintDerivation.idr
rename to tests/derivation/infra/self print 004/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 004/RunDerivedGen.idr b/tests/derivation/infra/self print 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 004/RunDerivedGen.idr
rename to tests/derivation/infra/self print 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 004/derive.ipkg b/tests/derivation/infra/self print 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 004/derive.ipkg
rename to tests/derivation/infra/self print 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self print 004/expected b/tests/derivation/infra/self print 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 004/expected
rename to tests/derivation/infra/self print 004/expected
diff --git a/tests/gen-derivation/derivation/infra/ext run 002/run b/tests/derivation/infra/self print 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 002/run
rename to tests/derivation/infra/self print 004/run
diff --git a/tests/gen-derivation/derivation/infra/self print 005/AlternativeCore.idr b/tests/derivation/infra/self print 005/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 005/AlternativeCore.idr
rename to tests/derivation/infra/self print 005/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 005/DerivedGen.idr b/tests/derivation/infra/self print 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 005/DerivedGen.idr
rename to tests/derivation/infra/self print 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 005/PrintDerivation.idr b/tests/derivation/infra/self print 005/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 005/PrintDerivation.idr
rename to tests/derivation/infra/self print 005/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 005/RunDerivedGen.idr b/tests/derivation/infra/self print 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 005/RunDerivedGen.idr
rename to tests/derivation/infra/self print 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 005/derive.ipkg b/tests/derivation/infra/self print 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 005/derive.ipkg
rename to tests/derivation/infra/self print 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self print 005/expected b/tests/derivation/infra/self print 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 005/expected
rename to tests/derivation/infra/self print 005/expected
diff --git a/tests/gen-derivation/derivation/infra/ext run 003/run b/tests/derivation/infra/self print 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 003/run
rename to tests/derivation/infra/self print 005/run
diff --git a/tests/gen-derivation/derivation/infra/self print 006/AlternativeCore.idr b/tests/derivation/infra/self print 006/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 006/AlternativeCore.idr
rename to tests/derivation/infra/self print 006/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 006/DerivedGen.idr b/tests/derivation/infra/self print 006/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 006/DerivedGen.idr
rename to tests/derivation/infra/self print 006/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 006/PrintDerivation.idr b/tests/derivation/infra/self print 006/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 006/PrintDerivation.idr
rename to tests/derivation/infra/self print 006/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 006/RunDerivedGen.idr b/tests/derivation/infra/self print 006/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 006/RunDerivedGen.idr
rename to tests/derivation/infra/self print 006/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 006/derive.ipkg b/tests/derivation/infra/self print 006/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 006/derive.ipkg
rename to tests/derivation/infra/self print 006/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self print 006/expected b/tests/derivation/infra/self print 006/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 006/expected
rename to tests/derivation/infra/self print 006/expected
diff --git a/tests/gen-derivation/derivation/infra/ext run 004/run b/tests/derivation/infra/self print 006/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/ext run 004/run
rename to tests/derivation/infra/self print 006/run
diff --git a/tests/gen-derivation/derivation/infra/self print 007/AlternativeCore.idr b/tests/derivation/infra/self print 007/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 007/AlternativeCore.idr
rename to tests/derivation/infra/self print 007/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 007/DerivedGen.idr b/tests/derivation/infra/self print 007/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 007/DerivedGen.idr
rename to tests/derivation/infra/self print 007/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 007/PrintDerivation.idr b/tests/derivation/infra/self print 007/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 007/PrintDerivation.idr
rename to tests/derivation/infra/self print 007/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 007/RunDerivedGen.idr b/tests/derivation/infra/self print 007/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 007/RunDerivedGen.idr
rename to tests/derivation/infra/self print 007/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 007/derive.ipkg b/tests/derivation/infra/self print 007/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 007/derive.ipkg
rename to tests/derivation/infra/self print 007/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self print 007/expected b/tests/derivation/infra/self print 007/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 007/expected
rename to tests/derivation/infra/self print 007/expected
diff --git a/tests/gen-derivation/derivation/infra/self print 001/run b/tests/derivation/infra/self print 007/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 001/run
rename to tests/derivation/infra/self print 007/run
diff --git a/tests/gen-derivation/derivation/infra/self print 008/AlternativeCore.idr b/tests/derivation/infra/self print 008/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 008/AlternativeCore.idr
rename to tests/derivation/infra/self print 008/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 008/DerivedGen.idr b/tests/derivation/infra/self print 008/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 008/DerivedGen.idr
rename to tests/derivation/infra/self print 008/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 008/PrintDerivation.idr b/tests/derivation/infra/self print 008/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 008/PrintDerivation.idr
rename to tests/derivation/infra/self print 008/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 008/RunDerivedGen.idr b/tests/derivation/infra/self print 008/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 008/RunDerivedGen.idr
rename to tests/derivation/infra/self print 008/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self print 008/derive.ipkg b/tests/derivation/infra/self print 008/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 008/derive.ipkg
rename to tests/derivation/infra/self print 008/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self print 008/expected b/tests/derivation/infra/self print 008/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 008/expected
rename to tests/derivation/infra/self print 008/expected
diff --git a/tests/gen-derivation/derivation/infra/self print 002/run b/tests/derivation/infra/self print 008/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 002/run
rename to tests/derivation/infra/self print 008/run
diff --git a/tests/gen-derivation/derivation/infra/self run 001/AlternativeCore.idr b/tests/derivation/infra/self run 001/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 001/AlternativeCore.idr
rename to tests/derivation/infra/self run 001/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 001/DerivedGen.idr b/tests/derivation/infra/self run 001/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 001/DerivedGen.idr
rename to tests/derivation/infra/self run 001/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 001/RunDerivedGen.idr b/tests/derivation/infra/self run 001/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 001/RunDerivedGen.idr
rename to tests/derivation/infra/self run 001/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 001/derive.ipkg b/tests/derivation/infra/self run 001/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 001/derive.ipkg
rename to tests/derivation/infra/self run 001/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 001/expected b/tests/derivation/infra/self run 001/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 001/expected
rename to tests/derivation/infra/self run 001/expected
diff --git a/tests/gen-derivation/derivation/infra/self print 003/run b/tests/derivation/infra/self run 001/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 003/run
rename to tests/derivation/infra/self run 001/run
diff --git a/tests/gen-derivation/derivation/infra/self run 002/AlternativeCore.idr b/tests/derivation/infra/self run 002/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 002/AlternativeCore.idr
rename to tests/derivation/infra/self run 002/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 002/DerivedGen.idr b/tests/derivation/infra/self run 002/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 002/DerivedGen.idr
rename to tests/derivation/infra/self run 002/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 002/RunDerivedGen.idr b/tests/derivation/infra/self run 002/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 002/RunDerivedGen.idr
rename to tests/derivation/infra/self run 002/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 002/derive.ipkg b/tests/derivation/infra/self run 002/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 002/derive.ipkg
rename to tests/derivation/infra/self run 002/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 002/expected b/tests/derivation/infra/self run 002/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 002/expected
rename to tests/derivation/infra/self run 002/expected
diff --git a/tests/gen-derivation/derivation/infra/self print 004/run b/tests/derivation/infra/self run 002/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 004/run
rename to tests/derivation/infra/self run 002/run
diff --git a/tests/gen-derivation/derivation/infra/self run 003/AlternativeCore.idr b/tests/derivation/infra/self run 003/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 003/AlternativeCore.idr
rename to tests/derivation/infra/self run 003/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 003/DerivedGen.idr b/tests/derivation/infra/self run 003/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 003/DerivedGen.idr
rename to tests/derivation/infra/self run 003/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 003/RunDerivedGen.idr b/tests/derivation/infra/self run 003/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 003/RunDerivedGen.idr
rename to tests/derivation/infra/self run 003/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 003/derive.ipkg b/tests/derivation/infra/self run 003/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 003/derive.ipkg
rename to tests/derivation/infra/self run 003/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 003/expected b/tests/derivation/infra/self run 003/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 003/expected
rename to tests/derivation/infra/self run 003/expected
diff --git a/tests/gen-derivation/derivation/infra/self print 005/run b/tests/derivation/infra/self run 003/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 005/run
rename to tests/derivation/infra/self run 003/run
diff --git a/tests/gen-derivation/derivation/infra/self run 004/AlternativeCore.idr b/tests/derivation/infra/self run 004/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 004/AlternativeCore.idr
rename to tests/derivation/infra/self run 004/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 004/DerivedGen.idr b/tests/derivation/infra/self run 004/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 004/DerivedGen.idr
rename to tests/derivation/infra/self run 004/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 004/RunDerivedGen.idr b/tests/derivation/infra/self run 004/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 004/RunDerivedGen.idr
rename to tests/derivation/infra/self run 004/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 004/derive.ipkg b/tests/derivation/infra/self run 004/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 004/derive.ipkg
rename to tests/derivation/infra/self run 004/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 004/expected b/tests/derivation/infra/self run 004/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 004/expected
rename to tests/derivation/infra/self run 004/expected
diff --git a/tests/gen-derivation/derivation/infra/self print 006/run b/tests/derivation/infra/self run 004/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 006/run
rename to tests/derivation/infra/self run 004/run
diff --git a/tests/gen-derivation/derivation/infra/self run 005/AlternativeCore.idr b/tests/derivation/infra/self run 005/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 005/AlternativeCore.idr
rename to tests/derivation/infra/self run 005/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 005/DerivedGen.idr b/tests/derivation/infra/self run 005/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 005/DerivedGen.idr
rename to tests/derivation/infra/self run 005/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 005/RunDerivedGen.idr b/tests/derivation/infra/self run 005/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 005/RunDerivedGen.idr
rename to tests/derivation/infra/self run 005/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 005/derive.ipkg b/tests/derivation/infra/self run 005/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 005/derive.ipkg
rename to tests/derivation/infra/self run 005/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 005/expected b/tests/derivation/infra/self run 005/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 005/expected
rename to tests/derivation/infra/self run 005/expected
diff --git a/tests/gen-derivation/derivation/infra/self print 007/run b/tests/derivation/infra/self run 005/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 007/run
rename to tests/derivation/infra/self run 005/run
diff --git a/tests/gen-derivation/derivation/infra/self run 006/AlternativeCore.idr b/tests/derivation/infra/self run 006/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 006/AlternativeCore.idr
rename to tests/derivation/infra/self run 006/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 006/DerivedGen.idr b/tests/derivation/infra/self run 006/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 006/DerivedGen.idr
rename to tests/derivation/infra/self run 006/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 006/RunDerivedGen.idr b/tests/derivation/infra/self run 006/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 006/RunDerivedGen.idr
rename to tests/derivation/infra/self run 006/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 006/derive.ipkg b/tests/derivation/infra/self run 006/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 006/derive.ipkg
rename to tests/derivation/infra/self run 006/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 006/expected b/tests/derivation/infra/self run 006/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 006/expected
rename to tests/derivation/infra/self run 006/expected
diff --git a/tests/gen-derivation/derivation/infra/self print 008/run b/tests/derivation/infra/self run 006/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self print 008/run
rename to tests/derivation/infra/self run 006/run
diff --git a/tests/gen-derivation/derivation/infra/self run 007/AlternativeCore.idr b/tests/derivation/infra/self run 007/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 007/AlternativeCore.idr
rename to tests/derivation/infra/self run 007/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 007/DerivedGen.idr b/tests/derivation/infra/self run 007/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 007/DerivedGen.idr
rename to tests/derivation/infra/self run 007/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 007/RunDerivedGen.idr b/tests/derivation/infra/self run 007/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 007/RunDerivedGen.idr
rename to tests/derivation/infra/self run 007/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 007/derive.ipkg b/tests/derivation/infra/self run 007/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 007/derive.ipkg
rename to tests/derivation/infra/self run 007/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 007/expected b/tests/derivation/infra/self run 007/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 007/expected
rename to tests/derivation/infra/self run 007/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 001/run b/tests/derivation/infra/self run 007/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 001/run
rename to tests/derivation/infra/self run 007/run
diff --git a/tests/gen-derivation/derivation/infra/self run 008/AlternativeCore.idr b/tests/derivation/infra/self run 008/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 008/AlternativeCore.idr
rename to tests/derivation/infra/self run 008/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 008/DerivedGen.idr b/tests/derivation/infra/self run 008/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 008/DerivedGen.idr
rename to tests/derivation/infra/self run 008/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 008/RunDerivedGen.idr b/tests/derivation/infra/self run 008/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 008/RunDerivedGen.idr
rename to tests/derivation/infra/self run 008/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 008/derive.ipkg b/tests/derivation/infra/self run 008/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 008/derive.ipkg
rename to tests/derivation/infra/self run 008/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 008/expected b/tests/derivation/infra/self run 008/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 008/expected
rename to tests/derivation/infra/self run 008/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 002/run b/tests/derivation/infra/self run 008/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 002/run
rename to tests/derivation/infra/self run 008/run
diff --git a/tests/gen-derivation/derivation/infra/self run 009/AlternativeCore.idr b/tests/derivation/infra/self run 009/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 009/AlternativeCore.idr
rename to tests/derivation/infra/self run 009/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 009/DerivedGen.idr b/tests/derivation/infra/self run 009/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 009/DerivedGen.idr
rename to tests/derivation/infra/self run 009/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 009/RunDerivedGen.idr b/tests/derivation/infra/self run 009/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 009/RunDerivedGen.idr
rename to tests/derivation/infra/self run 009/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 009/derive.ipkg b/tests/derivation/infra/self run 009/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 009/derive.ipkg
rename to tests/derivation/infra/self run 009/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 009/expected b/tests/derivation/infra/self run 009/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 009/expected
rename to tests/derivation/infra/self run 009/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 003/run b/tests/derivation/infra/self run 009/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 003/run
rename to tests/derivation/infra/self run 009/run
diff --git a/tests/gen-derivation/derivation/infra/self run 010/AlternativeCore.idr b/tests/derivation/infra/self run 010/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 010/AlternativeCore.idr
rename to tests/derivation/infra/self run 010/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 010/DerivedGen.idr b/tests/derivation/infra/self run 010/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 010/DerivedGen.idr
rename to tests/derivation/infra/self run 010/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 010/RunDerivedGen.idr b/tests/derivation/infra/self run 010/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 010/RunDerivedGen.idr
rename to tests/derivation/infra/self run 010/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/infra/self run 010/derive.ipkg b/tests/derivation/infra/self run 010/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 010/derive.ipkg
rename to tests/derivation/infra/self run 010/derive.ipkg
diff --git a/tests/gen-derivation/derivation/infra/self run 010/expected b/tests/derivation/infra/self run 010/expected
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 010/expected
rename to tests/derivation/infra/self run 010/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 004/run b/tests/derivation/infra/self run 010/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 004/run
rename to tests/derivation/infra/self run 010/run
diff --git a/tests/gen-derivation/derivation/infra/tests-scheme b/tests/derivation/infra/tests-scheme
similarity index 100%
rename from tests/gen-derivation/derivation/infra/tests-scheme
rename to tests/derivation/infra/tests-scheme
diff --git a/tests/gen-derivation/inputvalidation/_common/run b/tests/derivation/inputvalidation/_common/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/_common/run
rename to tests/derivation/inputvalidation/_common/run
diff --git a/tests/gen-derivation/inputvalidation/_common/validate-input.ipkg b/tests/derivation/inputvalidation/_common/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/_common/validate-input.ipkg
rename to tests/derivation/inputvalidation/_common/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/bad-args-in-target-type/ValidateInput.idr b/tests/derivation/inputvalidation/bad-args-in-target-type/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-args-in-target-type/ValidateInput.idr
rename to tests/derivation/inputvalidation/bad-args-in-target-type/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/bad-args-in-target-type/expected b/tests/derivation/inputvalidation/bad-args-in-target-type/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-args-in-target-type/expected
rename to tests/derivation/inputvalidation/bad-args-in-target-type/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 005/run b/tests/derivation/inputvalidation/bad-args-in-target-type/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 005/run
rename to tests/derivation/inputvalidation/bad-args-in-target-type/run
diff --git a/tests/gen-derivation/inputvalidation/bad-args-in-target-type/validate-input.ipkg b/tests/derivation/inputvalidation/bad-args-in-target-type/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-args-in-target-type/validate-input.ipkg
rename to tests/derivation/inputvalidation/bad-args-in-target-type/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/bad-fuel/ValidateInput.idr b/tests/derivation/inputvalidation/bad-fuel/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-fuel/ValidateInput.idr
rename to tests/derivation/inputvalidation/bad-fuel/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/bad-fuel/expected b/tests/derivation/inputvalidation/bad-fuel/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-fuel/expected
rename to tests/derivation/inputvalidation/bad-fuel/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 006/run b/tests/derivation/inputvalidation/bad-fuel/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 006/run
rename to tests/derivation/inputvalidation/bad-fuel/run
diff --git a/tests/gen-derivation/inputvalidation/bad-fuel/validate-input.ipkg b/tests/derivation/inputvalidation/bad-fuel/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-fuel/validate-input.ipkg
rename to tests/derivation/inputvalidation/bad-fuel/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/bad-param-names/ValidateInput.idr b/tests/derivation/inputvalidation/bad-param-names/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-param-names/ValidateInput.idr
rename to tests/derivation/inputvalidation/bad-param-names/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/bad-param-names/expected b/tests/derivation/inputvalidation/bad-param-names/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-param-names/expected
rename to tests/derivation/inputvalidation/bad-param-names/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 007/run b/tests/derivation/inputvalidation/bad-param-names/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 007/run
rename to tests/derivation/inputvalidation/bad-param-names/run
diff --git a/tests/gen-derivation/inputvalidation/bad-param-names/validate-input.ipkg b/tests/derivation/inputvalidation/bad-param-names/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-param-names/validate-input.ipkg
rename to tests/derivation/inputvalidation/bad-param-names/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/external-gens/ValidateInput.idr b/tests/derivation/inputvalidation/external-gens/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/external-gens/ValidateInput.idr
rename to tests/derivation/inputvalidation/external-gens/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/external-gens/expected b/tests/derivation/inputvalidation/external-gens/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/external-gens/expected
rename to tests/derivation/inputvalidation/external-gens/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 008/run b/tests/derivation/inputvalidation/external-gens/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 008/run
rename to tests/derivation/inputvalidation/external-gens/run
diff --git a/tests/gen-derivation/inputvalidation/external-gens/validate-input.ipkg b/tests/derivation/inputvalidation/external-gens/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/external-gens/validate-input.ipkg
rename to tests/derivation/inputvalidation/external-gens/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/non-gen-target-type/ValidateInput.idr b/tests/derivation/inputvalidation/non-gen-target-type/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/non-gen-target-type/ValidateInput.idr
rename to tests/derivation/inputvalidation/non-gen-target-type/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/non-gen-target-type/expected b/tests/derivation/inputvalidation/non-gen-target-type/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/non-gen-target-type/expected
rename to tests/derivation/inputvalidation/non-gen-target-type/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 009/run b/tests/derivation/inputvalidation/non-gen-target-type/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 009/run
rename to tests/derivation/inputvalidation/non-gen-target-type/run
diff --git a/tests/gen-derivation/inputvalidation/non-gen-target-type/validate-input.ipkg b/tests/derivation/inputvalidation/non-gen-target-type/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/non-gen-target-type/validate-input.ipkg
rename to tests/derivation/inputvalidation/non-gen-target-type/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/odd-or-lacking-gen-params/ValidateInput.idr b/tests/derivation/inputvalidation/odd-or-lacking-gen-params/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/odd-or-lacking-gen-params/ValidateInput.idr
rename to tests/derivation/inputvalidation/odd-or-lacking-gen-params/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/odd-or-lacking-gen-params/expected b/tests/derivation/inputvalidation/odd-or-lacking-gen-params/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/odd-or-lacking-gen-params/expected
rename to tests/derivation/inputvalidation/odd-or-lacking-gen-params/expected
diff --git a/tests/gen-derivation/derivation/infra/self run 010/run b/tests/derivation/inputvalidation/odd-or-lacking-gen-params/run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/self run 010/run
rename to tests/derivation/inputvalidation/odd-or-lacking-gen-params/run
diff --git a/tests/gen-derivation/inputvalidation/odd-or-lacking-gen-params/validate-input.ipkg b/tests/derivation/inputvalidation/odd-or-lacking-gen-params/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/odd-or-lacking-gen-params/validate-input.ipkg
rename to tests/derivation/inputvalidation/odd-or-lacking-gen-params/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/unexpected-gen-target/ValidateInput.idr b/tests/derivation/inputvalidation/unexpected-gen-target/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/unexpected-gen-target/ValidateInput.idr
rename to tests/derivation/inputvalidation/unexpected-gen-target/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/unexpected-gen-target/expected b/tests/derivation/inputvalidation/unexpected-gen-target/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/unexpected-gen-target/expected
rename to tests/derivation/inputvalidation/unexpected-gen-target/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/run b/tests/derivation/inputvalidation/unexpected-gen-target/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/run
rename to tests/derivation/inputvalidation/unexpected-gen-target/run
diff --git a/tests/gen-derivation/inputvalidation/unexpected-gen-target/validate-input.ipkg b/tests/derivation/inputvalidation/unexpected-gen-target/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/unexpected-gen-target/validate-input.ipkg
rename to tests/derivation/inputvalidation/unexpected-gen-target/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/unexpected-multiplicity/ValidateInput.idr b/tests/derivation/inputvalidation/unexpected-multiplicity/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/unexpected-multiplicity/ValidateInput.idr
rename to tests/derivation/inputvalidation/unexpected-multiplicity/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/unexpected-multiplicity/expected b/tests/derivation/inputvalidation/unexpected-multiplicity/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/unexpected-multiplicity/expected
rename to tests/derivation/inputvalidation/unexpected-multiplicity/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/run b/tests/derivation/inputvalidation/unexpected-multiplicity/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/run
rename to tests/derivation/inputvalidation/unexpected-multiplicity/run
diff --git a/tests/gen-derivation/inputvalidation/unexpected-multiplicity/validate-input.ipkg b/tests/derivation/inputvalidation/unexpected-multiplicity/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/unexpected-multiplicity/validate-input.ipkg
rename to tests/derivation/inputvalidation/unexpected-multiplicity/validate-input.ipkg
diff --git a/tests/gen-derivation/inputvalidation/wrong-params-order/ValidateInput.idr b/tests/derivation/inputvalidation/wrong-params-order/ValidateInput.idr
similarity index 100%
rename from tests/gen-derivation/inputvalidation/wrong-params-order/ValidateInput.idr
rename to tests/derivation/inputvalidation/wrong-params-order/ValidateInput.idr
diff --git a/tests/gen-derivation/inputvalidation/wrong-params-order/expected b/tests/derivation/inputvalidation/wrong-params-order/expected
similarity index 100%
rename from tests/gen-derivation/inputvalidation/wrong-params-order/expected
rename to tests/derivation/inputvalidation/wrong-params-order/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/run b/tests/derivation/inputvalidation/wrong-params-order/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/run
rename to tests/derivation/inputvalidation/wrong-params-order/run
diff --git a/tests/gen-derivation/inputvalidation/wrong-params-order/validate-input.ipkg b/tests/derivation/inputvalidation/wrong-params-order/validate-input.ipkg
similarity index 100%
rename from tests/gen-derivation/inputvalidation/wrong-params-order/validate-input.ipkg
rename to tests/derivation/inputvalidation/wrong-params-order/validate-input.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/001 trivial/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/001 trivial/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr b/tests/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/001 trivial/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/001 trivial/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/001 trivial/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/001 trivial/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/001 trivial/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/derive.ipkg b/tests/derivation/least-effort/print/adt/001 trivial/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/derive.ipkg
rename to tests/derivation/least-effort/print/adt/001 trivial/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/expected b/tests/derivation/least-effort/print/adt/001 trivial/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/001 trivial/expected
rename to tests/derivation/least-effort/print/adt/001 trivial/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/run b/tests/derivation/least-effort/print/adt/001 trivial/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/run
rename to tests/derivation/least-effort/print/adt/001 trivial/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/002 noparam/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/002 noparam/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr b/tests/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/002 noparam/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/002 noparam/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/002 noparam/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/002 noparam/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/002 noparam/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/derive.ipkg b/tests/derivation/least-effort/print/adt/002 noparam/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/derive.ipkg
rename to tests/derivation/least-effort/print/adt/002 noparam/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/expected b/tests/derivation/least-effort/print/adt/002 noparam/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/002 noparam/expected
rename to tests/derivation/least-effort/print/adt/002 noparam/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/005 param/run b/tests/derivation/least-effort/print/adt/002 noparam/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/005 param/run
rename to tests/derivation/least-effort/print/adt/002 noparam/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/003 noparam/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/003 noparam/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr b/tests/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/003 noparam/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/003 noparam/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/003 noparam/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/003 noparam/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/003 noparam/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/derive.ipkg b/tests/derivation/least-effort/print/adt/003 noparam/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/derive.ipkg
rename to tests/derivation/least-effort/print/adt/003 noparam/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/expected b/tests/derivation/least-effort/print/adt/003 noparam/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/003 noparam/expected
rename to tests/derivation/least-effort/print/adt/003 noparam/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/006 param/run b/tests/derivation/least-effort/print/adt/003 noparam/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/006 param/run
rename to tests/derivation/least-effort/print/adt/003 noparam/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/004 noparam/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/004 noparam/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr b/tests/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/004 noparam/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/004 noparam/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/004 noparam/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/004 noparam/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/004 noparam/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/derive.ipkg b/tests/derivation/least-effort/print/adt/004 noparam/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/derive.ipkg
rename to tests/derivation/least-effort/print/adt/004 noparam/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/expected b/tests/derivation/least-effort/print/adt/004 noparam/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/004 noparam/expected
rename to tests/derivation/least-effort/print/adt/004 noparam/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/run b/tests/derivation/least-effort/print/adt/004 noparam/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/run
rename to tests/derivation/least-effort/print/adt/004 noparam/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/005 param/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/005 param/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/005 param/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/005 param/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/005 param/DerivedGen.idr b/tests/derivation/least-effort/print/adt/005 param/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/005 param/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/005 param/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/005 param/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/005 param/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/005 param/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/005 param/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/005 param/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/005 param/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/005 param/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/005 param/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/005 param/derive.ipkg b/tests/derivation/least-effort/print/adt/005 param/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/005 param/derive.ipkg
rename to tests/derivation/least-effort/print/adt/005 param/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/005 param/expected b/tests/derivation/least-effort/print/adt/005 param/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/005 param/expected
rename to tests/derivation/least-effort/print/adt/005 param/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/run b/tests/derivation/least-effort/print/adt/005 param/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/run
rename to tests/derivation/least-effort/print/adt/005 param/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/006 param/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/006 param/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/006 param/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/006 param/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/006 param/DerivedGen.idr b/tests/derivation/least-effort/print/adt/006 param/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/006 param/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/006 param/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/006 param/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/006 param/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/006 param/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/006 param/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/006 param/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/006 param/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/006 param/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/006 param/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/006 param/derive.ipkg b/tests/derivation/least-effort/print/adt/006 param/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/006 param/derive.ipkg
rename to tests/derivation/least-effort/print/adt/006 param/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/006 param/expected b/tests/derivation/least-effort/print/adt/006 param/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/006 param/expected
rename to tests/derivation/least-effort/print/adt/006 param/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/run b/tests/derivation/least-effort/print/adt/006 param/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/run
rename to tests/derivation/least-effort/print/adt/006 param/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/007 right-to-left simple/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/007 right-to-left simple/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr b/tests/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/007 right-to-left simple/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/007 right-to-left simple/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/007 right-to-left simple/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/007 right-to-left simple/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/007 right-to-left simple/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/derive.ipkg b/tests/derivation/least-effort/print/adt/007 right-to-left simple/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/derive.ipkg
rename to tests/derivation/least-effort/print/adt/007 right-to-left simple/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/expected b/tests/derivation/least-effort/print/adt/007 right-to-left simple/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/007 right-to-left simple/expected
rename to tests/derivation/least-effort/print/adt/007 right-to-left simple/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/run b/tests/derivation/least-effort/print/adt/007 right-to-left simple/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/run
rename to tests/derivation/least-effort/print/adt/007 right-to-left simple/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/008 right-to-left simple/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/008 right-to-left simple/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr b/tests/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/008 right-to-left simple/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/008 right-to-left simple/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/008 right-to-left simple/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/008 right-to-left simple/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/008 right-to-left simple/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/derive.ipkg b/tests/derivation/least-effort/print/adt/008 right-to-left simple/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/derive.ipkg
rename to tests/derivation/least-effort/print/adt/008 right-to-left simple/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/expected b/tests/derivation/least-effort/print/adt/008 right-to-left simple/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/008 right-to-left simple/expected
rename to tests/derivation/least-effort/print/adt/008 right-to-left simple/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/run b/tests/derivation/least-effort/print/adt/008 right-to-left simple/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/run
rename to tests/derivation/least-effort/print/adt/008 right-to-left simple/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/009 left-to-right/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/009 left-to-right/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr b/tests/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/009 left-to-right/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/009 left-to-right/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/009 left-to-right/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/009 left-to-right/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/009 left-to-right/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/derive.ipkg b/tests/derivation/least-effort/print/adt/009 left-to-right/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/derive.ipkg
rename to tests/derivation/least-effort/print/adt/009 left-to-right/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/expected b/tests/derivation/least-effort/print/adt/009 left-to-right/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/009 left-to-right/expected
rename to tests/derivation/least-effort/print/adt/009 left-to-right/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/run b/tests/derivation/least-effort/print/adt/009 left-to-right/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/run
rename to tests/derivation/least-effort/print/adt/009 left-to-right/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/derive.ipkg b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/derive.ipkg
rename to tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected
rename to tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/run b/tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/run
rename to tests/derivation/least-effort/print/adt/010 right-to-left long-dpair/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/derive.ipkg b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/derive.ipkg
rename to tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected
rename to tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/run b/tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/run
rename to tests/derivation/least-effort/print/adt/011 right-to-left long-dpair/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/012 right-to-left chained/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/012 right-to-left chained/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr b/tests/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/012 right-to-left chained/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/012 right-to-left chained/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/012 right-to-left chained/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/012 right-to-left chained/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/012 right-to-left chained/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/derive.ipkg b/tests/derivation/least-effort/print/adt/012 right-to-left chained/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/derive.ipkg
rename to tests/derivation/least-effort/print/adt/012 right-to-left chained/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/expected b/tests/derivation/least-effort/print/adt/012 right-to-left chained/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/012 right-to-left chained/expected
rename to tests/derivation/least-effort/print/adt/012 right-to-left chained/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/run b/tests/derivation/least-effort/print/adt/012 right-to-left chained/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/run
rename to tests/derivation/least-effort/print/adt/012 right-to-left chained/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/013 right-to-left nondet/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/013 right-to-left nondet/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/013 right-to-left nondet/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/013 right-to-left nondet/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/derive.ipkg b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/derive.ipkg
rename to tests/derivation/least-effort/print/adt/013 right-to-left nondet/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/expected b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/013 right-to-left nondet/expected
rename to tests/derivation/least-effort/print/adt/013 right-to-left nondet/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/run b/tests/derivation/least-effort/print/adt/013 right-to-left nondet/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/run
rename to tests/derivation/least-effort/print/adt/013 right-to-left nondet/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/AlternativeCore.idr b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/AlternativeCore.idr
rename to tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr
rename to tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/PrintDerivation.idr b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/PrintDerivation.idr
rename to tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/RunDerivedGen.idr b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/derive.ipkg b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/derive.ipkg
rename to tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected
rename to tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/run b/tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/run
rename to tests/derivation/least-effort/print/adt/014 right-to-left nondet ext/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/adt/_common b/tests/derivation/least-effort/print/adt/_common
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/adt/_common
rename to tests/derivation/least-effort/print/adt/_common
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/001 gadt/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/001 gadt/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/001 gadt/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/001 gadt/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/001 gadt/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/001 gadt/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/001 gadt/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/derive.ipkg b/tests/derivation/least-effort/print/gadt/001 gadt/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/001 gadt/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/expected b/tests/derivation/least-effort/print/gadt/001 gadt/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/001 gadt/expected
rename to tests/derivation/least-effort/print/gadt/001 gadt/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/run b/tests/derivation/least-effort/print/gadt/001 gadt/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/run
rename to tests/derivation/least-effort/print/gadt/001 gadt/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/002 gadt/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/002 gadt/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/002 gadt/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/002 gadt/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/002 gadt/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/002 gadt/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/002 gadt/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/derive.ipkg b/tests/derivation/least-effort/print/gadt/002 gadt/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/002 gadt/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/expected b/tests/derivation/least-effort/print/gadt/002 gadt/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/002 gadt/expected
rename to tests/derivation/least-effort/print/gadt/002 gadt/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/run b/tests/derivation/least-effort/print/gadt/002 gadt/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/run
rename to tests/derivation/least-effort/print/gadt/002 gadt/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/003 right-to-left nondet/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/003 right-to-left nondet/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/003 right-to-left nondet/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/003 right-to-left nondet/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/derive.ipkg b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/003 right-to-left nondet/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/expected b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/003 right-to-left nondet/expected
rename to tests/derivation/least-effort/print/gadt/003 right-to-left nondet/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/run b/tests/derivation/least-effort/print/gadt/003 right-to-left nondet/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/run
rename to tests/derivation/least-effort/print/gadt/003 right-to-left nondet/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/004 right-to-left det/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/004 right-to-left det/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/004 right-to-left det/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/004 right-to-left det/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/004 right-to-left det/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/004 right-to-left det/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/004 right-to-left det/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/derive.ipkg b/tests/derivation/least-effort/print/gadt/004 right-to-left det/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/004 right-to-left det/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/expected b/tests/derivation/least-effort/print/gadt/004 right-to-left det/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/004 right-to-left det/expected
rename to tests/derivation/least-effort/print/gadt/004 right-to-left det/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/run b/tests/derivation/least-effort/print/gadt/004 right-to-left det/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/run
rename to tests/derivation/least-effort/print/gadt/004 right-to-left det/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/005 gadt/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/005 gadt/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/005 gadt/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/005 gadt/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/005 gadt/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/005 gadt/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/005 gadt/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/derive.ipkg b/tests/derivation/least-effort/print/gadt/005 gadt/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/005 gadt/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/expected b/tests/derivation/least-effort/print/gadt/005 gadt/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/005 gadt/expected
rename to tests/derivation/least-effort/print/gadt/005 gadt/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/run b/tests/derivation/least-effort/print/gadt/005 gadt/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/run
rename to tests/derivation/least-effort/print/gadt/005 gadt/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/006 gadt/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/006 gadt/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/006 gadt/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/006 gadt/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/006 gadt/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/006 gadt/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/006 gadt/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/derive.ipkg b/tests/derivation/least-effort/print/gadt/006 gadt/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/006 gadt/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/expected b/tests/derivation/least-effort/print/gadt/006 gadt/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/006 gadt/expected
rename to tests/derivation/least-effort/print/gadt/006 gadt/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/run b/tests/derivation/least-effort/print/gadt/006 gadt/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/run
rename to tests/derivation/least-effort/print/gadt/006 gadt/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/007 eq-n/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/007 eq-n/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/007 eq-n/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/007 eq-n/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/007 eq-n/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/007 eq-n/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/007 eq-n/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/derive.ipkg b/tests/derivation/least-effort/print/gadt/007 eq-n/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/007 eq-n/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/expected b/tests/derivation/least-effort/print/gadt/007 eq-n/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/007 eq-n/expected
rename to tests/derivation/least-effort/print/gadt/007 eq-n/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/run b/tests/derivation/least-effort/print/gadt/007 eq-n/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/run
rename to tests/derivation/least-effort/print/gadt/007 eq-n/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/008 eq-n/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/008 eq-n/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/008 eq-n/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/008 eq-n/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/008 eq-n/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/008 eq-n/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/008 eq-n/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/derive.ipkg b/tests/derivation/least-effort/print/gadt/008 eq-n/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/008 eq-n/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/expected b/tests/derivation/least-effort/print/gadt/008 eq-n/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/008 eq-n/expected
rename to tests/derivation/least-effort/print/gadt/008 eq-n/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/run b/tests/derivation/least-effort/print/gadt/008 eq-n/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/run
rename to tests/derivation/least-effort/print/gadt/008 eq-n/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/009 eq-n/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/009 eq-n/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/009 eq-n/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/009 eq-n/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/009 eq-n/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/009 eq-n/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/009 eq-n/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/derive.ipkg b/tests/derivation/least-effort/print/gadt/009 eq-n/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/009 eq-n/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/expected b/tests/derivation/least-effort/print/gadt/009 eq-n/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/009 eq-n/expected
rename to tests/derivation/least-effort/print/gadt/009 eq-n/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/run b/tests/derivation/least-effort/print/gadt/009 eq-n/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/run
rename to tests/derivation/least-effort/print/gadt/009 eq-n/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/010 eq-n/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/010 eq-n/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/010 eq-n/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/010 eq-n/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/010 eq-n/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/010 eq-n/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/010 eq-n/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/derive.ipkg b/tests/derivation/least-effort/print/gadt/010 eq-n/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/010 eq-n/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/expected b/tests/derivation/least-effort/print/gadt/010 eq-n/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/010 eq-n/expected
rename to tests/derivation/least-effort/print/gadt/010 eq-n/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/run b/tests/derivation/least-effort/print/gadt/010 eq-n/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/run
rename to tests/derivation/least-effort/print/gadt/010 eq-n/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/011 eq deepcons/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/011 eq deepcons/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/011 eq deepcons/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/011 eq deepcons/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/011 eq deepcons/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/011 eq deepcons/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/011 eq deepcons/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/derive.ipkg b/tests/derivation/least-effort/print/gadt/011 eq deepcons/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/011 eq deepcons/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/expected b/tests/derivation/least-effort/print/gadt/011 eq deepcons/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/011 eq deepcons/expected
rename to tests/derivation/least-effort/print/gadt/011 eq deepcons/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/run b/tests/derivation/least-effort/print/gadt/011 eq deepcons/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/run
rename to tests/derivation/least-effort/print/gadt/011 eq deepcons/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/012 eq deepcons/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/012 eq deepcons/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/012 eq deepcons/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/012 eq deepcons/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/012 eq deepcons/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/012 eq deepcons/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/012 eq deepcons/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/derive.ipkg b/tests/derivation/least-effort/print/gadt/012 eq deepcons/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/012 eq deepcons/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/expected b/tests/derivation/least-effort/print/gadt/012 eq deepcons/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/012 eq deepcons/expected
rename to tests/derivation/least-effort/print/gadt/012 eq deepcons/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/run b/tests/derivation/least-effort/print/gadt/012 eq deepcons/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/run
rename to tests/derivation/least-effort/print/gadt/012 eq deepcons/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/013 eq deepcons/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/013 eq deepcons/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/013 eq deepcons/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/013 eq deepcons/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/013 eq deepcons/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/013 eq deepcons/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/013 eq deepcons/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/derive.ipkg b/tests/derivation/least-effort/print/gadt/013 eq deepcons/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/013 eq deepcons/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/expected b/tests/derivation/least-effort/print/gadt/013 eq deepcons/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/013 eq deepcons/expected
rename to tests/derivation/least-effort/print/gadt/013 eq deepcons/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/run b/tests/derivation/least-effort/print/gadt/013 eq deepcons/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/run
rename to tests/derivation/least-effort/print/gadt/013 eq deepcons/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/AlternativeCore.idr b/tests/derivation/least-effort/print/gadt/014 eq deepcons/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/AlternativeCore.idr
rename to tests/derivation/least-effort/print/gadt/014 eq deepcons/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/014 eq deepcons/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/PrintDerivation.idr b/tests/derivation/least-effort/print/gadt/014 eq deepcons/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/PrintDerivation.idr
rename to tests/derivation/least-effort/print/gadt/014 eq deepcons/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/RunDerivedGen.idr b/tests/derivation/least-effort/print/gadt/014 eq deepcons/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/gadt/014 eq deepcons/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/derive.ipkg b/tests/derivation/least-effort/print/gadt/014 eq deepcons/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/derive.ipkg
rename to tests/derivation/least-effort/print/gadt/014 eq deepcons/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/expected b/tests/derivation/least-effort/print/gadt/014 eq deepcons/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/014 eq deepcons/expected
rename to tests/derivation/least-effort/print/gadt/014 eq deepcons/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/run b/tests/derivation/least-effort/print/gadt/014 eq deepcons/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/run
rename to tests/derivation/least-effort/print/gadt/014 eq deepcons/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/gadt/_common b/tests/derivation/least-effort/print/gadt/_common
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/gadt/_common
rename to tests/derivation/least-effort/print/gadt/_common
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/_common b/tests/derivation/least-effort/print/regression/_common
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/_common
rename to tests/derivation/least-effort/print/regression/_common
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/dependent-givens-big/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-big/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-big/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/dependent-givens-big/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-big/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-big/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-big/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/derive.ipkg b/tests/derivation/least-effort/print/regression/dependent-givens-big/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/derive.ipkg
rename to tests/derivation/least-effort/print/regression/dependent-givens-big/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/expected b/tests/derivation/least-effort/print/regression/dependent-givens-big/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-big/expected
rename to tests/derivation/least-effort/print/regression/dependent-givens-big/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/run b/tests/derivation/least-effort/print/regression/dependent-givens-big/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/run
rename to tests/derivation/least-effort/print/regression/dependent-givens-big/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-deep/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-deep/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-deep/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-deep/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/derive.ipkg b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/derive.ipkg
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-deep/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/expected b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-deep/expected
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-deep/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/run b/tests/derivation/least-effort/print/regression/dependent-givens-small-deep/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/run
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-deep/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/derive.ipkg b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/derive.ipkg
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/run b/tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/run
rename to tests/derivation/least-effort/print/regression/dependent-givens-small-shallow/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/derive.ipkg b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/derive.ipkg
rename to tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected
rename to tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/run b/tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/run
rename to tests/derivation/least-effort/print/regression/lost-deceq-four-occurences/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/derive.ipkg b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/derive.ipkg
rename to tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected
rename to tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/run b/tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/run
rename to tests/derivation/least-effort/print/regression/lost-deceq-three-occurences/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/derive.ipkg b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/derive.ipkg
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/run b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/run
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-complex/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/derive.ipkg b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/derive.ipkg
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/expected
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/run b/tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/run
rename to tests/derivation/least-effort/print/regression/too-early-rename-multiple-simple/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/derive.ipkg b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/derive.ipkg
rename to tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected
rename to tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/run b/tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/run
rename to tests/derivation/least-effort/print/regression/too-early-rename-single-dependency/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/unification-mismatch-dependent/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/unification-mismatch-dependent/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/unification-mismatch-dependent/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/unification-mismatch-dependent/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/derive.ipkg b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/derive.ipkg
rename to tests/derivation/least-effort/print/regression/unification-mismatch-dependent/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/expected b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-mismatch-dependent/expected
rename to tests/derivation/least-effort/print/regression/unification-mismatch-dependent/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/run b/tests/derivation/least-effort/print/regression/unification-mismatch-dependent/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/run
rename to tests/derivation/least-effort/print/regression/unification-mismatch-dependent/run
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/AlternativeCore.idr b/tests/derivation/least-effort/print/regression/unification-name-mismatch/AlternativeCore.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/AlternativeCore.idr
rename to tests/derivation/least-effort/print/regression/unification-name-mismatch/AlternativeCore.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr b/tests/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr
rename to tests/derivation/least-effort/print/regression/unification-name-mismatch/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/PrintDerivation.idr b/tests/derivation/least-effort/print/regression/unification-name-mismatch/PrintDerivation.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/PrintDerivation.idr
rename to tests/derivation/least-effort/print/regression/unification-name-mismatch/PrintDerivation.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/RunDerivedGen.idr b/tests/derivation/least-effort/print/regression/unification-name-mismatch/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/RunDerivedGen.idr
rename to tests/derivation/least-effort/print/regression/unification-name-mismatch/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/derive.ipkg b/tests/derivation/least-effort/print/regression/unification-name-mismatch/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/derive.ipkg
rename to tests/derivation/least-effort/print/regression/unification-name-mismatch/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/expected b/tests/derivation/least-effort/print/regression/unification-name-mismatch/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/print/regression/unification-name-mismatch/expected
rename to tests/derivation/least-effort/print/regression/unification-name-mismatch/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/run b/tests/derivation/least-effort/print/regression/unification-name-mismatch/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/run
rename to tests/derivation/least-effort/print/regression/unification-name-mismatch/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/DerivedGen.idr b/tests/derivation/least-effort/run/adt/001 trivial/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/001 trivial/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/001 trivial/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/001 trivial/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/derive.ipkg b/tests/derivation/least-effort/run/adt/001 trivial/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/derive.ipkg
rename to tests/derivation/least-effort/run/adt/001 trivial/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/expected b/tests/derivation/least-effort/run/adt/001 trivial/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/001 trivial/expected
rename to tests/derivation/least-effort/run/adt/001 trivial/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/run b/tests/derivation/least-effort/run/adt/001 trivial/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/run
rename to tests/derivation/least-effort/run/adt/001 trivial/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/DerivedGen.idr b/tests/derivation/least-effort/run/adt/002 noparam/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/002 noparam/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/002 noparam/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/002 noparam/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/derive.ipkg b/tests/derivation/least-effort/run/adt/002 noparam/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/derive.ipkg
rename to tests/derivation/least-effort/run/adt/002 noparam/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/expected b/tests/derivation/least-effort/run/adt/002 noparam/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/002 noparam/expected
rename to tests/derivation/least-effort/run/adt/002 noparam/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/005 param/run b/tests/derivation/least-effort/run/adt/002 noparam/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/005 param/run
rename to tests/derivation/least-effort/run/adt/002 noparam/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/DerivedGen.idr b/tests/derivation/least-effort/run/adt/003 noparam/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/003 noparam/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/003 noparam/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/003 noparam/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/derive.ipkg b/tests/derivation/least-effort/run/adt/003 noparam/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/derive.ipkg
rename to tests/derivation/least-effort/run/adt/003 noparam/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/expected b/tests/derivation/least-effort/run/adt/003 noparam/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/003 noparam/expected
rename to tests/derivation/least-effort/run/adt/003 noparam/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/006 param/run b/tests/derivation/least-effort/run/adt/003 noparam/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/006 param/run
rename to tests/derivation/least-effort/run/adt/003 noparam/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/DerivedGen.idr b/tests/derivation/least-effort/run/adt/004 noparam/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/004 noparam/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/004 noparam/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/004 noparam/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/derive.ipkg b/tests/derivation/least-effort/run/adt/004 noparam/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/derive.ipkg
rename to tests/derivation/least-effort/run/adt/004 noparam/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/expected b/tests/derivation/least-effort/run/adt/004 noparam/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/004 noparam/expected
rename to tests/derivation/least-effort/run/adt/004 noparam/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/run b/tests/derivation/least-effort/run/adt/004 noparam/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/run
rename to tests/derivation/least-effort/run/adt/004 noparam/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/005 param/DerivedGen.idr b/tests/derivation/least-effort/run/adt/005 param/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/005 param/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/005 param/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/005 param/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/005 param/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/005 param/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/005 param/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/005 param/derive.ipkg b/tests/derivation/least-effort/run/adt/005 param/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/005 param/derive.ipkg
rename to tests/derivation/least-effort/run/adt/005 param/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/005 param/expected b/tests/derivation/least-effort/run/adt/005 param/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/005 param/expected
rename to tests/derivation/least-effort/run/adt/005 param/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/run b/tests/derivation/least-effort/run/adt/005 param/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/run
rename to tests/derivation/least-effort/run/adt/005 param/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/006 param/DerivedGen.idr b/tests/derivation/least-effort/run/adt/006 param/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/006 param/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/006 param/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/006 param/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/006 param/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/006 param/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/006 param/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/006 param/derive.ipkg b/tests/derivation/least-effort/run/adt/006 param/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/006 param/derive.ipkg
rename to tests/derivation/least-effort/run/adt/006 param/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/006 param/expected b/tests/derivation/least-effort/run/adt/006 param/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/006 param/expected
rename to tests/derivation/least-effort/run/adt/006 param/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/run b/tests/derivation/least-effort/run/adt/006 param/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/run
rename to tests/derivation/least-effort/run/adt/006 param/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/DerivedGen.idr b/tests/derivation/least-effort/run/adt/007 right-to-left simple/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/007 right-to-left simple/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/007 right-to-left simple/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/007 right-to-left simple/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/derive.ipkg b/tests/derivation/least-effort/run/adt/007 right-to-left simple/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/derive.ipkg
rename to tests/derivation/least-effort/run/adt/007 right-to-left simple/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/expected b/tests/derivation/least-effort/run/adt/007 right-to-left simple/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/007 right-to-left simple/expected
rename to tests/derivation/least-effort/run/adt/007 right-to-left simple/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/run b/tests/derivation/least-effort/run/adt/007 right-to-left simple/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/run
rename to tests/derivation/least-effort/run/adt/007 right-to-left simple/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/DerivedGen.idr b/tests/derivation/least-effort/run/adt/008 right-to-left simple/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/008 right-to-left simple/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/008 right-to-left simple/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/008 right-to-left simple/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/derive.ipkg b/tests/derivation/least-effort/run/adt/008 right-to-left simple/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/derive.ipkg
rename to tests/derivation/least-effort/run/adt/008 right-to-left simple/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/expected b/tests/derivation/least-effort/run/adt/008 right-to-left simple/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/008 right-to-left simple/expected
rename to tests/derivation/least-effort/run/adt/008 right-to-left simple/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/run b/tests/derivation/least-effort/run/adt/008 right-to-left simple/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/run
rename to tests/derivation/least-effort/run/adt/008 right-to-left simple/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/DerivedGen.idr b/tests/derivation/least-effort/run/adt/009 left-to-right/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/009 left-to-right/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/009 left-to-right/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/009 left-to-right/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/derive.ipkg b/tests/derivation/least-effort/run/adt/009 left-to-right/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/derive.ipkg
rename to tests/derivation/least-effort/run/adt/009 left-to-right/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/expected b/tests/derivation/least-effort/run/adt/009 left-to-right/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/009 left-to-right/expected
rename to tests/derivation/least-effort/run/adt/009 left-to-right/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/run b/tests/derivation/least-effort/run/adt/009 left-to-right/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/run
rename to tests/derivation/least-effort/run/adt/009 left-to-right/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/DerivedGen.idr b/tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/derive.ipkg b/tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/derive.ipkg
rename to tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/expected b/tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/010 right-to-left long-dpair/expected
rename to tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/run b/tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/run
rename to tests/derivation/least-effort/run/adt/010 right-to-left long-dpair/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/DerivedGen.idr b/tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/derive.ipkg b/tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/derive.ipkg
rename to tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/expected b/tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/011 right-to-left long-dpair/expected
rename to tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/run b/tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/run
rename to tests/derivation/least-effort/run/adt/011 right-to-left long-dpair/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/DerivedGen.idr b/tests/derivation/least-effort/run/adt/012 right-to-left chained/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/012 right-to-left chained/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/012 right-to-left chained/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/012 right-to-left chained/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/derive.ipkg b/tests/derivation/least-effort/run/adt/012 right-to-left chained/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/derive.ipkg
rename to tests/derivation/least-effort/run/adt/012 right-to-left chained/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/expected b/tests/derivation/least-effort/run/adt/012 right-to-left chained/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/012 right-to-left chained/expected
rename to tests/derivation/least-effort/run/adt/012 right-to-left chained/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/run b/tests/derivation/least-effort/run/adt/012 right-to-left chained/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/run
rename to tests/derivation/least-effort/run/adt/012 right-to-left chained/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/DerivedGen.idr b/tests/derivation/least-effort/run/adt/013 right-to-left nondet/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/013 right-to-left nondet/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/013 right-to-left nondet/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/013 right-to-left nondet/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/derive.ipkg b/tests/derivation/least-effort/run/adt/013 right-to-left nondet/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/derive.ipkg
rename to tests/derivation/least-effort/run/adt/013 right-to-left nondet/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/expected b/tests/derivation/least-effort/run/adt/013 right-to-left nondet/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/013 right-to-left nondet/expected
rename to tests/derivation/least-effort/run/adt/013 right-to-left nondet/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/run b/tests/derivation/least-effort/run/adt/013 right-to-left nondet/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/run
rename to tests/derivation/least-effort/run/adt/013 right-to-left nondet/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/DerivedGen.idr b/tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/DerivedGen.idr
rename to tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/RunDerivedGen.idr b/tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/derive.ipkg b/tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/derive.ipkg
rename to tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/expected b/tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/014 right-to-left nondet ext/expected
rename to tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/run b/tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/run
rename to tests/derivation/least-effort/run/adt/014 right-to-left nondet ext/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/adt/_common b/tests/derivation/least-effort/run/adt/_common
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/adt/_common
rename to tests/derivation/least-effort/run/adt/_common
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/001 gadt/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/001 gadt/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/001 gadt/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/001 gadt/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/derive.ipkg b/tests/derivation/least-effort/run/gadt/001 gadt/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/001 gadt/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/expected b/tests/derivation/least-effort/run/gadt/001 gadt/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/001 gadt/expected
rename to tests/derivation/least-effort/run/gadt/001 gadt/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/run b/tests/derivation/least-effort/run/gadt/001 gadt/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/run
rename to tests/derivation/least-effort/run/gadt/001 gadt/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/002 gadt/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/002 gadt/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/002 gadt/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/002 gadt/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/derive.ipkg b/tests/derivation/least-effort/run/gadt/002 gadt/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/002 gadt/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/expected b/tests/derivation/least-effort/run/gadt/002 gadt/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/002 gadt/expected
rename to tests/derivation/least-effort/run/gadt/002 gadt/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/run b/tests/derivation/least-effort/run/gadt/002 gadt/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/run
rename to tests/derivation/least-effort/run/gadt/002 gadt/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/003 right-to-left nondet/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/003 right-to-left nondet/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/003 right-to-left nondet/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/003 right-to-left nondet/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/derive.ipkg b/tests/derivation/least-effort/run/gadt/003 right-to-left nondet/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/003 right-to-left nondet/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/expected b/tests/derivation/least-effort/run/gadt/003 right-to-left nondet/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/003 right-to-left nondet/expected
rename to tests/derivation/least-effort/run/gadt/003 right-to-left nondet/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/run b/tests/derivation/least-effort/run/gadt/003 right-to-left nondet/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/run
rename to tests/derivation/least-effort/run/gadt/003 right-to-left nondet/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/004 right-to-left det/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/004 right-to-left det/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/004 right-to-left det/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/004 right-to-left det/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/derive.ipkg b/tests/derivation/least-effort/run/gadt/004 right-to-left det/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/004 right-to-left det/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/expected b/tests/derivation/least-effort/run/gadt/004 right-to-left det/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/004 right-to-left det/expected
rename to tests/derivation/least-effort/run/gadt/004 right-to-left det/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/run b/tests/derivation/least-effort/run/gadt/004 right-to-left det/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/run
rename to tests/derivation/least-effort/run/gadt/004 right-to-left det/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/005 gadt/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/005 gadt/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/005 gadt/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/005 gadt/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/derive.ipkg b/tests/derivation/least-effort/run/gadt/005 gadt/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/005 gadt/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/expected b/tests/derivation/least-effort/run/gadt/005 gadt/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/005 gadt/expected
rename to tests/derivation/least-effort/run/gadt/005 gadt/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/run b/tests/derivation/least-effort/run/gadt/005 gadt/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/run
rename to tests/derivation/least-effort/run/gadt/005 gadt/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/006 gadt/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/006 gadt/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/006 gadt/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/006 gadt/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/derive.ipkg b/tests/derivation/least-effort/run/gadt/006 gadt/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/006 gadt/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/expected b/tests/derivation/least-effort/run/gadt/006 gadt/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/006 gadt/expected
rename to tests/derivation/least-effort/run/gadt/006 gadt/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/run b/tests/derivation/least-effort/run/gadt/006 gadt/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/run
rename to tests/derivation/least-effort/run/gadt/006 gadt/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/007 eq-n/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/007 eq-n/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/007 eq-n/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/007 eq-n/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/derive.ipkg b/tests/derivation/least-effort/run/gadt/007 eq-n/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/007 eq-n/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/expected b/tests/derivation/least-effort/run/gadt/007 eq-n/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/007 eq-n/expected
rename to tests/derivation/least-effort/run/gadt/007 eq-n/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/run b/tests/derivation/least-effort/run/gadt/007 eq-n/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/run
rename to tests/derivation/least-effort/run/gadt/007 eq-n/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/008 eq-n/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/008 eq-n/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/008 eq-n/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/008 eq-n/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/derive.ipkg b/tests/derivation/least-effort/run/gadt/008 eq-n/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/008 eq-n/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/expected b/tests/derivation/least-effort/run/gadt/008 eq-n/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/008 eq-n/expected
rename to tests/derivation/least-effort/run/gadt/008 eq-n/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/run b/tests/derivation/least-effort/run/gadt/008 eq-n/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/run
rename to tests/derivation/least-effort/run/gadt/008 eq-n/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/009 eq-n/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/009 eq-n/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/009 eq-n/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/009 eq-n/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/derive.ipkg b/tests/derivation/least-effort/run/gadt/009 eq-n/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/009 eq-n/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/expected b/tests/derivation/least-effort/run/gadt/009 eq-n/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/009 eq-n/expected
rename to tests/derivation/least-effort/run/gadt/009 eq-n/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/run b/tests/derivation/least-effort/run/gadt/009 eq-n/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/run
rename to tests/derivation/least-effort/run/gadt/009 eq-n/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/010 eq-n/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/010 eq-n/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/010 eq-n/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/010 eq-n/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/derive.ipkg b/tests/derivation/least-effort/run/gadt/010 eq-n/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/010 eq-n/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/expected b/tests/derivation/least-effort/run/gadt/010 eq-n/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/010 eq-n/expected
rename to tests/derivation/least-effort/run/gadt/010 eq-n/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/run b/tests/derivation/least-effort/run/gadt/010 eq-n/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/run
rename to tests/derivation/least-effort/run/gadt/010 eq-n/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/011 eq deepcons/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/011 eq deepcons/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/011 eq deepcons/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/011 eq deepcons/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/derive.ipkg b/tests/derivation/least-effort/run/gadt/011 eq deepcons/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/011 eq deepcons/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/expected b/tests/derivation/least-effort/run/gadt/011 eq deepcons/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/011 eq deepcons/expected
rename to tests/derivation/least-effort/run/gadt/011 eq deepcons/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/run b/tests/derivation/least-effort/run/gadt/011 eq deepcons/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/run
rename to tests/derivation/least-effort/run/gadt/011 eq deepcons/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/012 eq deepcons/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/012 eq deepcons/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/012 eq deepcons/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/012 eq deepcons/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/derive.ipkg b/tests/derivation/least-effort/run/gadt/012 eq deepcons/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/012 eq deepcons/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/expected b/tests/derivation/least-effort/run/gadt/012 eq deepcons/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/012 eq deepcons/expected
rename to tests/derivation/least-effort/run/gadt/012 eq deepcons/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/run b/tests/derivation/least-effort/run/gadt/012 eq deepcons/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/run
rename to tests/derivation/least-effort/run/gadt/012 eq deepcons/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/013 eq deepcons/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/013 eq deepcons/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/013 eq deepcons/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/013 eq deepcons/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/derive.ipkg b/tests/derivation/least-effort/run/gadt/013 eq deepcons/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/013 eq deepcons/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/expected b/tests/derivation/least-effort/run/gadt/013 eq deepcons/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/013 eq deepcons/expected
rename to tests/derivation/least-effort/run/gadt/013 eq deepcons/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/run b/tests/derivation/least-effort/run/gadt/013 eq deepcons/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/run
rename to tests/derivation/least-effort/run/gadt/013 eq deepcons/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/DerivedGen.idr b/tests/derivation/least-effort/run/gadt/014 eq deepcons/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/DerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/014 eq deepcons/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/RunDerivedGen.idr b/tests/derivation/least-effort/run/gadt/014 eq deepcons/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/gadt/014 eq deepcons/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/derive.ipkg b/tests/derivation/least-effort/run/gadt/014 eq deepcons/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/derive.ipkg
rename to tests/derivation/least-effort/run/gadt/014 eq deepcons/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/expected b/tests/derivation/least-effort/run/gadt/014 eq deepcons/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/014 eq deepcons/expected
rename to tests/derivation/least-effort/run/gadt/014 eq deepcons/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/run b/tests/derivation/least-effort/run/gadt/014 eq deepcons/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/run
rename to tests/derivation/least-effort/run/gadt/014 eq deepcons/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/gadt/_common b/tests/derivation/least-effort/run/gadt/_common
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/gadt/_common
rename to tests/derivation/least-effort/run/gadt/_common
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/_common b/tests/derivation/least-effort/run/regression/_common
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/_common
rename to tests/derivation/least-effort/run/regression/_common
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/DerivedGen.idr b/tests/derivation/least-effort/run/regression/dependent-givens-big/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/dependent-givens-big/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/dependent-givens-big/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/dependent-givens-big/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/derive.ipkg b/tests/derivation/least-effort/run/regression/dependent-givens-big/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/derive.ipkg
rename to tests/derivation/least-effort/run/regression/dependent-givens-big/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/expected b/tests/derivation/least-effort/run/regression/dependent-givens-big/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-big/expected
rename to tests/derivation/least-effort/run/regression/dependent-givens-big/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/run b/tests/derivation/least-effort/run/regression/dependent-givens-big/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/run
rename to tests/derivation/least-effort/run/regression/dependent-givens-big/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/DerivedGen.idr b/tests/derivation/least-effort/run/regression/dependent-givens-small-deep/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-deep/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/dependent-givens-small-deep/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-deep/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/derive.ipkg b/tests/derivation/least-effort/run/regression/dependent-givens-small-deep/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/derive.ipkg
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-deep/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/expected b/tests/derivation/least-effort/run/regression/dependent-givens-small-deep/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-deep/expected
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-deep/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/run b/tests/derivation/least-effort/run/regression/dependent-givens-small-deep/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/run
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-deep/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/DerivedGen.idr b/tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/derive.ipkg b/tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/derive.ipkg
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/expected b/tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/dependent-givens-small-shallow/expected
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/run b/tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/run
rename to tests/derivation/least-effort/run/regression/dependent-givens-small-shallow/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/DerivedGen.idr b/tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/derive.ipkg b/tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/derive.ipkg
rename to tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/expected b/tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-four-occurences/expected
rename to tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/run b/tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/run
rename to tests/derivation/least-effort/run/regression/lost-deceq-four-occurences/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/DerivedGen.idr b/tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/derive.ipkg b/tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/derive.ipkg
rename to tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/expected b/tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/lost-deceq-three-occurences/expected
rename to tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/run b/tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/run
rename to tests/derivation/least-effort/run/regression/lost-deceq-three-occurences/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/DerivedGen.idr b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/derive.ipkg b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/derive.ipkg
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/expected b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-complex/expected
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/run b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/run
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-complex/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/DerivedGen.idr b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/derive.ipkg b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/derive.ipkg
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/expected b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-multiple-simple/expected
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/expected
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/run b/tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/run
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/run
rename to tests/derivation/least-effort/run/regression/too-early-rename-multiple-simple/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/DerivedGen.idr b/tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/derive.ipkg b/tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/derive.ipkg
rename to tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/expected b/tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/too-early-rename-single-dependency/expected
rename to tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/expected
diff --git a/tests/gen-derivation/inputvalidation/bad-args-in-target-type/run b/tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-args-in-target-type/run
rename to tests/derivation/least-effort/run/regression/too-early-rename-single-dependency/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/DerivedGen.idr b/tests/derivation/least-effort/run/regression/unification-mismatch-dependent/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/unification-mismatch-dependent/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/unification-mismatch-dependent/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/unification-mismatch-dependent/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/derive.ipkg b/tests/derivation/least-effort/run/regression/unification-mismatch-dependent/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/derive.ipkg
rename to tests/derivation/least-effort/run/regression/unification-mismatch-dependent/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/expected b/tests/derivation/least-effort/run/regression/unification-mismatch-dependent/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-mismatch-dependent/expected
rename to tests/derivation/least-effort/run/regression/unification-mismatch-dependent/expected
diff --git a/tests/gen-derivation/inputvalidation/bad-fuel/run b/tests/derivation/least-effort/run/regression/unification-mismatch-dependent/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-fuel/run
rename to tests/derivation/least-effort/run/regression/unification-mismatch-dependent/run
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/DerivedGen.idr b/tests/derivation/least-effort/run/regression/unification-name-mismatch/DerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/DerivedGen.idr
rename to tests/derivation/least-effort/run/regression/unification-name-mismatch/DerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/RunDerivedGen.idr b/tests/derivation/least-effort/run/regression/unification-name-mismatch/RunDerivedGen.idr
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/RunDerivedGen.idr
rename to tests/derivation/least-effort/run/regression/unification-name-mismatch/RunDerivedGen.idr
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/derive.ipkg b/tests/derivation/least-effort/run/regression/unification-name-mismatch/derive.ipkg
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/derive.ipkg
rename to tests/derivation/least-effort/run/regression/unification-name-mismatch/derive.ipkg
diff --git a/tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/expected b/tests/derivation/least-effort/run/regression/unification-name-mismatch/expected
similarity index 100%
rename from tests/gen-derivation/derivation/least-effort/run/regression/unification-name-mismatch/expected
rename to tests/derivation/least-effort/run/regression/unification-name-mismatch/expected
diff --git a/tests/gen-derivation/inputvalidation/bad-param-names/run b/tests/derivation/least-effort/run/regression/unification-name-mismatch/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/bad-param-names/run
rename to tests/derivation/least-effort/run/regression/unification-name-mismatch/run
diff --git a/tests/gen-derivation/arg-deps/_common/Infra.idr b/tests/derivation/utils/arg-deps/_common/Infra.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/_common/Infra.idr
rename to tests/derivation/utils/arg-deps/_common/Infra.idr
diff --git a/tests/gen-derivation/arg-deps/_common/arg-deps.ipkg b/tests/derivation/utils/arg-deps/_common/arg-deps.ipkg
similarity index 100%
rename from tests/gen-derivation/arg-deps/_common/arg-deps.ipkg
rename to tests/derivation/utils/arg-deps/_common/arg-deps.ipkg
diff --git a/tests/gen-derivation/arg-deps/_common/run b/tests/derivation/utils/arg-deps/_common/run
similarity index 100%
rename from tests/gen-derivation/arg-deps/_common/run
rename to tests/derivation/utils/arg-deps/_common/run
diff --git a/tests/gen-derivation/arg-deps/deps-001-simple/DepsCheck.idr b/tests/derivation/utils/arg-deps/deps-001-simple/DepsCheck.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-001-simple/DepsCheck.idr
rename to tests/derivation/utils/arg-deps/deps-001-simple/DepsCheck.idr
diff --git a/tests/gen-derivation/arg-deps/deps-001-simple/Infra.idr b/tests/derivation/utils/arg-deps/deps-001-simple/Infra.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-001-simple/Infra.idr
rename to tests/derivation/utils/arg-deps/deps-001-simple/Infra.idr
diff --git a/tests/gen-derivation/arg-deps/deps-001-simple/arg-deps.ipkg b/tests/derivation/utils/arg-deps/deps-001-simple/arg-deps.ipkg
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-001-simple/arg-deps.ipkg
rename to tests/derivation/utils/arg-deps/deps-001-simple/arg-deps.ipkg
diff --git a/tests/gen-derivation/arg-deps/deps-001-simple/expected b/tests/derivation/utils/arg-deps/deps-001-simple/expected
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-001-simple/expected
rename to tests/derivation/utils/arg-deps/deps-001-simple/expected
diff --git a/tests/gen-derivation/inputvalidation/external-gens/run b/tests/derivation/utils/arg-deps/deps-001-simple/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/external-gens/run
rename to tests/derivation/utils/arg-deps/deps-001-simple/run
diff --git a/tests/gen-derivation/arg-deps/deps-002-longer-transitive/DepsCheck.idr b/tests/derivation/utils/arg-deps/deps-002-longer-transitive/DepsCheck.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-002-longer-transitive/DepsCheck.idr
rename to tests/derivation/utils/arg-deps/deps-002-longer-transitive/DepsCheck.idr
diff --git a/tests/gen-derivation/arg-deps/deps-002-longer-transitive/Infra.idr b/tests/derivation/utils/arg-deps/deps-002-longer-transitive/Infra.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-002-longer-transitive/Infra.idr
rename to tests/derivation/utils/arg-deps/deps-002-longer-transitive/Infra.idr
diff --git a/tests/gen-derivation/arg-deps/deps-002-longer-transitive/arg-deps.ipkg b/tests/derivation/utils/arg-deps/deps-002-longer-transitive/arg-deps.ipkg
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-002-longer-transitive/arg-deps.ipkg
rename to tests/derivation/utils/arg-deps/deps-002-longer-transitive/arg-deps.ipkg
diff --git a/tests/gen-derivation/arg-deps/deps-002-longer-transitive/expected b/tests/derivation/utils/arg-deps/deps-002-longer-transitive/expected
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-002-longer-transitive/expected
rename to tests/derivation/utils/arg-deps/deps-002-longer-transitive/expected
diff --git a/tests/gen-derivation/inputvalidation/non-gen-target-type/run b/tests/derivation/utils/arg-deps/deps-002-longer-transitive/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/non-gen-target-type/run
rename to tests/derivation/utils/arg-deps/deps-002-longer-transitive/run
diff --git a/tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/DepsCheck.idr b/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/DepsCheck.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/DepsCheck.idr
rename to tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/DepsCheck.idr
diff --git a/tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/Infra.idr b/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/Infra.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/Infra.idr
rename to tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/Infra.idr
diff --git a/tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/arg-deps.ipkg b/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/arg-deps.ipkg
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/arg-deps.ipkg
rename to tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/arg-deps.ipkg
diff --git a/tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/dont-run b/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/dont-run
similarity index 100%
rename from tests/gen-derivation/derivation/core/norec t-pi->.. w_ext 001/dont-run
rename to tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/dont-run
diff --git a/tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/expected b/tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/expected
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-003-lambda-shadowing/expected
rename to tests/derivation/utils/arg-deps/deps-003-lambda-shadowing/expected
diff --git a/tests/gen-derivation/arg-deps/deps-004-case/DepsCheck.idr b/tests/derivation/utils/arg-deps/deps-004-case/DepsCheck.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-004-case/DepsCheck.idr
rename to tests/derivation/utils/arg-deps/deps-004-case/DepsCheck.idr
diff --git a/tests/gen-derivation/arg-deps/deps-004-case/Infra.idr b/tests/derivation/utils/arg-deps/deps-004-case/Infra.idr
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-004-case/Infra.idr
rename to tests/derivation/utils/arg-deps/deps-004-case/Infra.idr
diff --git a/tests/gen-derivation/arg-deps/deps-004-case/arg-deps.ipkg b/tests/derivation/utils/arg-deps/deps-004-case/arg-deps.ipkg
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-004-case/arg-deps.ipkg
rename to tests/derivation/utils/arg-deps/deps-004-case/arg-deps.ipkg
diff --git a/tests/gen-derivation/derivation/infra/empty-cons run 013/dont-run b/tests/derivation/utils/arg-deps/deps-004-case/dont-run
similarity index 100%
rename from tests/gen-derivation/derivation/infra/empty-cons run 013/dont-run
rename to tests/derivation/utils/arg-deps/deps-004-case/dont-run
diff --git a/tests/gen-derivation/arg-deps/deps-004-case/expected b/tests/derivation/utils/arg-deps/deps-004-case/expected
similarity index 100%
rename from tests/gen-derivation/arg-deps/deps-004-case/expected
rename to tests/derivation/utils/arg-deps/deps-004-case/expected
diff --git a/tests/gen-derivation/canonicsig/_common/Infra.idr b/tests/derivation/utils/canonicsig/_common/Infra.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/_common/Infra.idr
rename to tests/derivation/utils/canonicsig/_common/Infra.idr
diff --git a/tests/gen-derivation/canonicsig/_common/canonic-sig.ipkg b/tests/derivation/utils/canonicsig/_common/canonic-sig.ipkg
similarity index 100%
rename from tests/gen-derivation/canonicsig/_common/canonic-sig.ipkg
rename to tests/derivation/utils/canonicsig/_common/canonic-sig.ipkg
diff --git a/tests/gen-derivation/canonicsig/_common/run b/tests/derivation/utils/canonicsig/_common/run
similarity index 100%
rename from tests/gen-derivation/canonicsig/_common/run
rename to tests/derivation/utils/canonicsig/_common/run
diff --git a/tests/gen-derivation/canonicsig/dep-params/CanonicSigCheck.idr b/tests/derivation/utils/canonicsig/dep-params/CanonicSigCheck.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/dep-params/CanonicSigCheck.idr
rename to tests/derivation/utils/canonicsig/dep-params/CanonicSigCheck.idr
diff --git a/tests/gen-derivation/canonicsig/dep-params/Infra.idr b/tests/derivation/utils/canonicsig/dep-params/Infra.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/dep-params/Infra.idr
rename to tests/derivation/utils/canonicsig/dep-params/Infra.idr
diff --git a/tests/gen-derivation/canonicsig/dep-params/canonic-sig.ipkg b/tests/derivation/utils/canonicsig/dep-params/canonic-sig.ipkg
similarity index 100%
rename from tests/gen-derivation/canonicsig/dep-params/canonic-sig.ipkg
rename to tests/derivation/utils/canonicsig/dep-params/canonic-sig.ipkg
diff --git a/tests/gen-derivation/canonicsig/dep-params/expected b/tests/derivation/utils/canonicsig/dep-params/expected
similarity index 100%
rename from tests/gen-derivation/canonicsig/dep-params/expected
rename to tests/derivation/utils/canonicsig/dep-params/expected
diff --git a/tests/gen-derivation/inputvalidation/odd-or-lacking-gen-params/run b/tests/derivation/utils/canonicsig/dep-params/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/odd-or-lacking-gen-params/run
rename to tests/derivation/utils/canonicsig/dep-params/run
diff --git a/tests/gen-derivation/canonicsig/nondep-expl-params/CanonicSigCheck.idr b/tests/derivation/utils/canonicsig/nondep-expl-params/CanonicSigCheck.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-expl-params/CanonicSigCheck.idr
rename to tests/derivation/utils/canonicsig/nondep-expl-params/CanonicSigCheck.idr
diff --git a/tests/gen-derivation/canonicsig/nondep-expl-params/Infra.idr b/tests/derivation/utils/canonicsig/nondep-expl-params/Infra.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-expl-params/Infra.idr
rename to tests/derivation/utils/canonicsig/nondep-expl-params/Infra.idr
diff --git a/tests/gen-derivation/canonicsig/nondep-expl-params/canonic-sig.ipkg b/tests/derivation/utils/canonicsig/nondep-expl-params/canonic-sig.ipkg
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-expl-params/canonic-sig.ipkg
rename to tests/derivation/utils/canonicsig/nondep-expl-params/canonic-sig.ipkg
diff --git a/tests/gen-derivation/canonicsig/nondep-expl-params/expected b/tests/derivation/utils/canonicsig/nondep-expl-params/expected
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-expl-params/expected
rename to tests/derivation/utils/canonicsig/nondep-expl-params/expected
diff --git a/tests/gen-derivation/inputvalidation/unexpected-gen-target/run b/tests/derivation/utils/canonicsig/nondep-expl-params/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/unexpected-gen-target/run
rename to tests/derivation/utils/canonicsig/nondep-expl-params/run
diff --git a/tests/gen-derivation/canonicsig/nondep-mixed-params/CanonicSigCheck.idr b/tests/derivation/utils/canonicsig/nondep-mixed-params/CanonicSigCheck.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-mixed-params/CanonicSigCheck.idr
rename to tests/derivation/utils/canonicsig/nondep-mixed-params/CanonicSigCheck.idr
diff --git a/tests/gen-derivation/canonicsig/nondep-mixed-params/Infra.idr b/tests/derivation/utils/canonicsig/nondep-mixed-params/Infra.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-mixed-params/Infra.idr
rename to tests/derivation/utils/canonicsig/nondep-mixed-params/Infra.idr
diff --git a/tests/gen-derivation/canonicsig/nondep-mixed-params/canonic-sig.ipkg b/tests/derivation/utils/canonicsig/nondep-mixed-params/canonic-sig.ipkg
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-mixed-params/canonic-sig.ipkg
rename to tests/derivation/utils/canonicsig/nondep-mixed-params/canonic-sig.ipkg
diff --git a/tests/gen-derivation/canonicsig/nondep-mixed-params/expected b/tests/derivation/utils/canonicsig/nondep-mixed-params/expected
similarity index 100%
rename from tests/gen-derivation/canonicsig/nondep-mixed-params/expected
rename to tests/derivation/utils/canonicsig/nondep-mixed-params/expected
diff --git a/tests/gen-derivation/inputvalidation/unexpected-multiplicity/run b/tests/derivation/utils/canonicsig/nondep-mixed-params/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/unexpected-multiplicity/run
rename to tests/derivation/utils/canonicsig/nondep-mixed-params/run
diff --git a/tests/gen-derivation/canonicsig/trivial/CanonicSigCheck.idr b/tests/derivation/utils/canonicsig/trivial/CanonicSigCheck.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/trivial/CanonicSigCheck.idr
rename to tests/derivation/utils/canonicsig/trivial/CanonicSigCheck.idr
diff --git a/tests/gen-derivation/canonicsig/trivial/Infra.idr b/tests/derivation/utils/canonicsig/trivial/Infra.idr
similarity index 100%
rename from tests/gen-derivation/canonicsig/trivial/Infra.idr
rename to tests/derivation/utils/canonicsig/trivial/Infra.idr
diff --git a/tests/gen-derivation/canonicsig/trivial/canonic-sig.ipkg b/tests/derivation/utils/canonicsig/trivial/canonic-sig.ipkg
similarity index 100%
rename from tests/gen-derivation/canonicsig/trivial/canonic-sig.ipkg
rename to tests/derivation/utils/canonicsig/trivial/canonic-sig.ipkg
diff --git a/tests/gen-derivation/canonicsig/trivial/expected b/tests/derivation/utils/canonicsig/trivial/expected
similarity index 100%
rename from tests/gen-derivation/canonicsig/trivial/expected
rename to tests/derivation/utils/canonicsig/trivial/expected
diff --git a/tests/gen-derivation/inputvalidation/wrong-params-order/run b/tests/derivation/utils/canonicsig/trivial/run
similarity index 100%
rename from tests/gen-derivation/inputvalidation/wrong-params-order/run
rename to tests/derivation/utils/canonicsig/trivial/run
diff --git a/tests/gen-derivation/cons-analysis/_common-deep-cons-app/Infra.idr b/tests/derivation/utils/cons-analysis/_common-deep-cons-app/Infra.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/_common-deep-cons-app/Infra.idr
rename to tests/derivation/utils/cons-analysis/_common-deep-cons-app/Infra.idr
diff --git a/tests/gen-derivation/cons-analysis/_common-deep-cons-app/cons.ipkg b/tests/derivation/utils/cons-analysis/_common-deep-cons-app/cons.ipkg
similarity index 100%
rename from tests/gen-derivation/cons-analysis/_common-deep-cons-app/cons.ipkg
rename to tests/derivation/utils/cons-analysis/_common-deep-cons-app/cons.ipkg
diff --git a/tests/gen-derivation/cons-analysis/_common-deep-cons-app/run b/tests/derivation/utils/cons-analysis/_common-deep-cons-app/run
similarity index 100%
rename from tests/gen-derivation/cons-analysis/_common-deep-cons-app/run
rename to tests/derivation/utils/cons-analysis/_common-deep-cons-app/run
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-001/ConsApps.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-001/ConsApps.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-001/ConsApps.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-001/ConsApps.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-001/Infra.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-001/Infra.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-001/Infra.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-001/Infra.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-001/cons.ipkg b/tests/derivation/utils/cons-analysis/deep-cons-app-001/cons.ipkg
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-001/cons.ipkg
rename to tests/derivation/utils/cons-analysis/deep-cons-app-001/cons.ipkg
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-001/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-001/expected
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-001/expected
rename to tests/derivation/utils/cons-analysis/deep-cons-app-001/expected
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-001/run b/tests/derivation/utils/cons-analysis/deep-cons-app-001/run
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-001/run
rename to tests/derivation/utils/cons-analysis/deep-cons-app-001/run
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/ConsApps.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/ConsApps.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/ConsApps.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/ConsApps.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/Infra.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/Infra.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/Infra.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/Infra.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/cons.ipkg b/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/cons.ipkg
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/cons.ipkg
rename to tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/cons.ipkg
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/expected
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/expected
rename to tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/expected
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/run b/tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/run
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-002-neg/run
rename to tests/derivation/utils/cons-analysis/deep-cons-app-002-neg/run
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-003/ConsApps.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-003/ConsApps.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-003/ConsApps.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-003/ConsApps.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-003/Infra.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-003/Infra.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-003/Infra.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-003/Infra.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-003/cons.ipkg b/tests/derivation/utils/cons-analysis/deep-cons-app-003/cons.ipkg
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-003/cons.ipkg
rename to tests/derivation/utils/cons-analysis/deep-cons-app-003/cons.ipkg
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-003/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-003/expected
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-003/expected
rename to tests/derivation/utils/cons-analysis/deep-cons-app-003/expected
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-003/run b/tests/derivation/utils/cons-analysis/deep-cons-app-003/run
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-003/run
rename to tests/derivation/utils/cons-analysis/deep-cons-app-003/run
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-004/ConsApps.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-004/ConsApps.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-004/ConsApps.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-004/ConsApps.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-004/Infra.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-004/Infra.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-004/Infra.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-004/Infra.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-004/cons.ipkg b/tests/derivation/utils/cons-analysis/deep-cons-app-004/cons.ipkg
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-004/cons.ipkg
rename to tests/derivation/utils/cons-analysis/deep-cons-app-004/cons.ipkg
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-004/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-004/expected
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-004/expected
rename to tests/derivation/utils/cons-analysis/deep-cons-app-004/expected
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-004/run b/tests/derivation/utils/cons-analysis/deep-cons-app-004/run
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-004/run
rename to tests/derivation/utils/cons-analysis/deep-cons-app-004/run
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/ConsApps.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/ConsApps.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/ConsApps.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/ConsApps.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/Infra.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/Infra.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/Infra.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/Infra.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/cons.ipkg b/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/cons.ipkg
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/cons.ipkg
rename to tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/cons.ipkg
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/expected
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/expected
rename to tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/expected
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/run b/tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/run
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-005-neg/run
rename to tests/derivation/utils/cons-analysis/deep-cons-app-005-neg/run
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-006/ConsApps.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-006/ConsApps.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-006/ConsApps.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-006/ConsApps.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-006/Infra.idr b/tests/derivation/utils/cons-analysis/deep-cons-app-006/Infra.idr
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-006/Infra.idr
rename to tests/derivation/utils/cons-analysis/deep-cons-app-006/Infra.idr
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-006/cons.ipkg b/tests/derivation/utils/cons-analysis/deep-cons-app-006/cons.ipkg
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-006/cons.ipkg
rename to tests/derivation/utils/cons-analysis/deep-cons-app-006/cons.ipkg
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-006/expected b/tests/derivation/utils/cons-analysis/deep-cons-app-006/expected
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-006/expected
rename to tests/derivation/utils/cons-analysis/deep-cons-app-006/expected
diff --git a/tests/gen-derivation/cons-analysis/deep-cons-app-006/run b/tests/derivation/utils/cons-analysis/deep-cons-app-006/run
similarity index 100%
rename from tests/gen-derivation/cons-analysis/deep-cons-app-006/run
rename to tests/derivation/utils/cons-analysis/deep-cons-app-006/run
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/_common/Infra.idr b/tests/derivation/utils/up-to-renaming-ttimp-eq/_common/Infra.idr
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/_common/Infra.idr
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/_common/Infra.idr
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/_common/renaming-ttimp-eq.ipkg b/tests/derivation/utils/up-to-renaming-ttimp-eq/_common/renaming-ttimp-eq.ipkg
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/_common/renaming-ttimp-eq.ipkg
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/_common/renaming-ttimp-eq.ipkg
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/_common/run b/tests/derivation/utils/up-to-renaming-ttimp-eq/_common/run
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/_common/run
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/_common/run
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/Infra.idr b/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/Infra.idr
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/Infra.idr
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/Infra.idr
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/RenamingTTImpEqCheck.idr b/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/RenamingTTImpEqCheck.idr
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/RenamingTTImpEqCheck.idr
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/RenamingTTImpEqCheck.idr
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/expected b/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/expected
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/expected
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/expected
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/renaming-ttimp-eq.ipkg b/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/renaming-ttimp-eq.ipkg
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/renaming-ttimp-eq.ipkg
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/renaming-ttimp-eq.ipkg
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/run b/tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/run
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/renaming/run
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/renaming/run
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/simple/Infra.idr b/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/Infra.idr
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/simple/Infra.idr
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/simple/Infra.idr
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/simple/RenamingTTImpEqCheck.idr b/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/RenamingTTImpEqCheck.idr
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/simple/RenamingTTImpEqCheck.idr
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/simple/RenamingTTImpEqCheck.idr
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/simple/expected b/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/expected
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/simple/expected
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/simple/expected
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/simple/renaming-ttimp-eq.ipkg b/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/renaming-ttimp-eq.ipkg
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/simple/renaming-ttimp-eq.ipkg
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/simple/renaming-ttimp-eq.ipkg
diff --git a/tests/gen-derivation/up-to-renaming-ttimp-eq/simple/run b/tests/derivation/utils/up-to-renaming-ttimp-eq/simple/run
similarity index 100%
rename from tests/gen-derivation/up-to-renaming-ttimp-eq/simple/run
rename to tests/derivation/utils/up-to-renaming-ttimp-eq/simple/run
diff --git a/tests/gen-derivation/derivation/distribution/_common b/tests/gen-derivation/derivation/distribution/_common
deleted file mode 120000
index ef111f4ad..000000000
--- a/tests/gen-derivation/derivation/distribution/_common
+++ /dev/null
@@ -1 +0,0 @@
-../../../lib/distribution/_common/
\ No newline at end of file
diff --git a/tests/runner/Runner.idr b/tests/runner/Runner.idr
index 981f39abc..2c0d41bae 100644
--- a/tests/runner/Runner.idr
+++ b/tests/runner/Runner.idr
@@ -12,15 +12,15 @@ main = goldenRunner $
   [ "The `Gen` monad" `atDir` "lib/gen-monad"
   , "Distribution of generators" `atDir` "lib/distribution"
   , "The library documentation" `atDir` "docs"
-  , "Auto derivation: infrastructure: input validation" `atDir` "gen-derivation/inputvalidation"
-  , "Auto derivation: infrastructure: TTImp equality up to renaming" `atDir` "gen-derivation/up-to-renaming-ttimp-eq"
-  , "Auto derivation: infrastructure: canonic signature" `atDir` "gen-derivation/canonicsig"
-  , "Auto derivation: infrastructure: constructors analysis" `atDir` "gen-derivation/cons-analysis"
-  , "Auto derivation: infrastructure: running harness" `atDir` "gen-derivation/derivation/infra"
-  , "Auto derivation: infrastructure: argument dependencies" `atDir` "gen-derivation/arg-deps"
-  , [ "Auto derivation: core: cons: least effort (\{p}, \{w})" `atDir` "gen-derivation/derivation/least-effort/\{p}/\{w}"
+  , "Derivation utils: TTImp equality up to renaming" `atDir` "derivation/utils/up-to-renaming-ttimp-eq"
+  , "Derivation utils: canonic signature" `atDir` "derivation/utils/canonicsig"
+  , "Derivation utils: constructors analysis" `atDir` "derivation/utils/cons-analysis"
+  , "Derivation utils: argument dependencies" `atDir` "derivation/utils/arg-deps"
+  , "Derivation: input validation" `atDir` "derivation/inputvalidation"
+  , "Derivation: running harness" `atDir` "derivation/infra"
+  , [ "Derivation: least effort (\{p}, \{w})" `atDir` "derivation/least-effort/\{p}/\{w}"
     | p <- ["print", "run"], w <- ["adt", "gadt", "regression"]
     ]
-  , "Auto derivation: core: derivation itself" `atDir` "gen-derivation/derivation/core"
-  , "Auto derivation: core: distribution" `atDir` "gen-derivation/derivation/distribution"
+  , "Derivation: core" `atDir` "derivation/core"
+  , "Derivation: distribution" `atDir` "derivation/distribution"
   ]