diff --git a/lib/wrappers/x11/xrender.nim b/lib/wrappers/x11/xrender.nim
diff --git a/lib/wrappers/x11/xresource.nim b/lib/wrappers/x11/xresource.nim
diff --git a/lib/wrappers/x11/xshm.nim b/lib/wrappers/x11/xshm.nim
diff --git a/lib/wrappers/x11/xutil.nim b/lib/wrappers/x11/xutil.nim
diff --git a/lib/wrappers/x11/xv.nim b/lib/wrappers/x11/xv.nim
diff --git a/lib/wrappers/x11/xvlib.nim b/lib/wrappers/x11/xvlib.nim
diff --git a/lib/wrappers/zip/libzip.nim b/lib/wrappers/zip/libzip.nim
diff --git a/lib/wrappers/zip/zlib.nim b/lib/wrappers/zip/zlib.nim
diff --git a/lib/wrappers/zmq.nim b/lib/wrappers/zmq.nim
diff --git a/readme.md b/readme.md
diff --git a/readme.txt b/readme.txt
diff --git a/tests/run/tactiontable.nim → tests/actiontable/tactiontable.nim b/tests/run/tactiontable.nim → tests/actiontable/tactiontable.nim
diff --git a/tests/actiontable/tactiontable2.nim b/tests/actiontable/tactiontable2.nim
diff --git a/tests/compile/talias.nim → tests/alias/talias.nim b/tests/compile/talias.nim → tests/alias/talias.nim
diff --git a/tests/reject/mambsym1.nim → tests/ambsym/mambsym1.nim b/tests/reject/mambsym1.nim → tests/ambsym/mambsym1.nim
diff --git a/tests/reject/mambsym2.nim → tests/ambsym/mambsym2.nim b/tests/reject/mambsym2.nim → tests/ambsym/mambsym2.nim
diff --git a/tests/run/mambsys1.nim → tests/ambsym/mambsys1.nim b/tests/run/mambsys1.nim → tests/ambsym/mambsys1.nim
diff --git a/tests/run/mambsys2.nim → tests/ambsym/mambsys2.nim b/tests/run/mambsys2.nim → tests/ambsym/mambsys2.nim
diff --git a/tests/reject/tambsym.nim → tests/ambsym/tambsym.nim b/tests/reject/tambsym.nim → tests/ambsym/tambsym.nim
diff --git a/tests/run/tambsym2.nim → tests/ambsym/tambsym2.nim b/tests/run/tambsym2.nim → tests/ambsym/tambsym2.nim
diff --git a/tests/reject/tambsym3.nim → tests/ambsym/tambsym3.nim b/tests/reject/tambsym3.nim → tests/ambsym/tambsym3.nim
diff --git a/tests/run/tambsys.nim → tests/ambsym/tambsys.nim b/tests/run/tambsys.nim → tests/ambsym/tambsys.nim
diff --git a/tests/run/tarray.nim → tests/array/tarray.nim b/tests/run/tarray.nim → tests/array/tarray.nim
diff --git a/tests/run/tarray2.nim → tests/array/tarray2.nim b/tests/run/tarray2.nim → tests/array/tarray2.nim
diff --git a/tests/run/tarray3.nim → tests/array/tarray3.nim b/tests/run/tarray3.nim → tests/array/tarray3.nim
diff --git a/tests/reject/tarraycons.nim → tests/array/tarraycons.nim b/tests/reject/tarraycons.nim → tests/array/tarraycons.nim
diff --git a/tests/run/tarraycons.nim → tests/array/tarraycons2.nim b/tests/run/tarraycons.nim → tests/array/tarraycons2.nim
diff --git a/tests/reject/tarrayplus.nim → tests/array/tarrayplus.nim b/tests/reject/tarrayplus.nim → tests/array/tarrayplus.nim
diff --git a/tests/compile/tarrindx.nim → tests/array/tarrindx.nim b/tests/compile/tarrindx.nim → tests/array/tarrindx.nim
diff --git a/tests/run/tassert.nim → tests/assert/tassert.nim b/tests/run/tassert.nim → tests/assert/tassert.nim
diff --git a/tests/assert/tfailedassert.nim b/tests/assert/tfailedassert.nim
diff --git a/tests/assert/tunittests.nim b/tests/assert/tunittests.nim
diff --git a/tests/run/tuserassert.nim → tests/assert/tuserassert.nim b/tests/run/tuserassert.nim → tests/assert/tuserassert.nim
diff --git a/tests/compile/tassign.nim → tests/assign/tassign.nim b/tests/compile/tassign.nim → tests/assign/tassign.nim
diff --git a/tests/run/tcopy.nim → tests/assign/tcopy.nim b/tests/run/tcopy.nim → tests/assign/tcopy.nim
diff --git a/tests/run/tgenericassign.nim → tests/assign/tgenericassign.nim b/tests/run/tgenericassign.nim → tests/assign/tgenericassign.nim
diff --git a/tests/run/tgenericassigntuples.nim → tests/assign/tgenericassigntuples.nim b/tests/run/tgenericassigntuples.nim → tests/assign/tgenericassigntuples.nim
diff --git a/tests/assign/tobjasgn.nim b/tests/assign/tobjasgn.nim
diff --git a/tests/run/tvariantasgn.nim → tests/assign/tvariantasgn.nim b/tests/run/tvariantasgn.nim → tests/assign/tvariantasgn.nim
diff --git a/tests/run/tastoverload1.nim → tests/astoverload/tastoverload1.nim b/tests/run/tastoverload1.nim → tests/astoverload/tastoverload1.nim
diff --git a/tests/async/tasyncawait.nim b/tests/async/tasyncawait.nim
diff --git a/tests/run/tasynciossl.nim → tests/async/tasynciossl.nim b/tests/run/tasynciossl.nim → tests/async/tasynciossl.nim
diff --git a/tests/run/tasyncudp.nim → tests/async/tasyncudp.nim b/tests/run/tasyncudp.nim → tests/async/tasyncudp.nim
diff --git a/tests/run/mbind3.nim → tests/bind/mbind3.nim b/tests/run/mbind3.nim → tests/bind/mbind3.nim
diff --git a/tests/run/tbind1.nim → tests/bind/tbind1.nim b/tests/run/tbind1.nim → tests/bind/tbind1.nim
diff --git a/tests/reject/tbind2.nim → tests/bind/tbind2.nim b/tests/reject/tbind2.nim → tests/bind/tbind2.nim
diff --git a/tests/run/tbind3.nim → tests/bind/tbind3.nim b/tests/run/tbind3.nim → tests/bind/tbind3.nim
diff --git a/tests/compile/tbindoverload.nim → tests/bind/tbindoverload.nim b/tests/compile/tbindoverload.nim → tests/bind/tbindoverload.nim
diff --git a/tests/compile/tdatabind.nim → tests/bind/tdatabind.nim b/tests/compile/tdatabind.nim → tests/bind/tdatabind.nim
diff --git a/tests/reject/tbindtypedesc.nim → tests/bind/tinvalidbindtypedesc.nim b/tests/reject/tbindtypedesc.nim → tests/bind/tinvalidbindtypedesc.nim
diff --git a/tests/run/tmixin.nim → tests/bind/tmixin.nim b/tests/run/tmixin.nim → tests/bind/tmixin.nim
diff --git a/tests/bind/tnicerrorforsymchoice.nim b/tests/bind/tnicerrorforsymchoice.nim
diff --git a/tests/run/tborrow.nim → tests/borrow/tborrow.nim b/tests/run/tborrow.nim → tests/borrow/tborrow.nim
diff --git a/tests/borrow/tinvalidborrow.nim b/tests/borrow/tinvalidborrow.nim
diff --git a/tests/caas/absurd_nesting.nim b/tests/caas/absurd_nesting.nim
diff --git a/tests/caas/absurd_nesting.txt b/tests/caas/absurd_nesting.txt
diff --git a/tests/caas/basic-recompile.txt b/tests/caas/basic-recompile.txt
diff --git a/tests/caas/compile-suggest.txt b/tests/caas/compile-suggest.txt
diff --git a/tests/caas/compile-then-def.txt b/tests/caas/compile-then-def.txt
diff --git a/tests/caas/completion_dot_syntax.txt b/tests/caas/completion_dot_syntax.txt
diff --git a/tests/caas/completion_dot_syntax_dirty.nim b/tests/caas/completion_dot_syntax_dirty.nim
diff --git a/tests/caas/completion_dot_syntax_main.nim b/tests/caas/completion_dot_syntax_main.nim
diff --git a/tests/caas/def-def-compile.txt b/tests/caas/def-def-compile.txt
diff --git a/tests/caas/def-then-compile.txt b/tests/caas/def-then-compile.txt
diff --git a/tests/caas/forward_declarations.nim b/tests/caas/forward_declarations.nim
diff --git a/tests/caas/forward_declarations.txt b/tests/caas/forward_declarations.txt
diff --git a/tests/caas/forward_usages.txt b/tests/caas/forward_usages.txt
diff --git a/tests/caas/idetools_api.nim b/tests/caas/idetools_api.nim
diff --git a/tests/caas/idetools_api.txt b/tests/caas/idetools_api.txt
diff --git a/tests/caas/issue_416_template_shift.nim b/tests/caas/issue_416_template_shift.nim
diff --git a/tests/caas/issue_416_template_shift.txt b/tests/caas/issue_416_template_shift.txt
diff --git a/tests/caas/issue_452_export_shift.nim b/tests/caas/issue_452_export_shift.nim
diff --git a/tests/caas/issue_452_export_shift.txt b/tests/caas/issue_452_export_shift.txt
diff --git a/tests/caas/issue_477_dynamic_dispatch.nim b/tests/caas/issue_477_dynamic_dispatch.nim
diff --git a/tests/caas/issue_477_dynamic_dispatch.txt b/tests/caas/issue_477_dynamic_dispatch.txt
diff --git a/tests/caas/its_full_of_procs.nim b/tests/caas/its_full_of_procs.nim
diff --git a/tests/caas/its_full_of_procs.txt b/tests/caas/its_full_of_procs.txt
diff --git a/tests/caas/suggest-compile.txt b/tests/caas/suggest-compile.txt
diff --git a/tests/caas/suggest-invalid-source.txt b/tests/caas/suggest-invalid-source.txt
diff --git a/tests/caasdriver.nim b/tests/caasdriver.nim
diff --git a/tests/run/tcase_setconstr.nim → tests/casestmt/tcase_setconstr.nim b/tests/run/tcase_setconstr.nim → tests/casestmt/tcase_setconstr.nim
diff --git a/tests/reject/tcaseexpr1.nim → tests/casestmt/tcaseexpr1.nim b/tests/reject/tcaseexpr1.nim → tests/casestmt/tcaseexpr1.nim
diff --git a/tests/reject/tcaseoverlaprange.nim → tests/casestmt/tcaseoverlaprange.nim b/tests/reject/tcaseoverlaprange.nim → tests/casestmt/tcaseoverlaprange.nim
diff --git a/tests/reject/tcaseoverlaprange2.nim → tests/casestmt/tcaseoverlaprange2.nim b/tests/reject/tcaseoverlaprange2.nim → tests/casestmt/tcaseoverlaprange2.nim
diff --git a/tests/run/tcasestm.nim → tests/casestmt/tcasestm.nim b/tests/run/tcasestm.nim → tests/casestmt/tcasestm.nim
diff --git a/tests/casestmt/tcomputedgoto.nim b/tests/casestmt/tcomputedgoto.nim
diff --git a/tests/compile/tlinearscanend.nim → tests/casestmt/tlinearscanend.nim b/tests/compile/tlinearscanend.nim → tests/casestmt/tlinearscanend.nim
diff --git a/tests/compile/tccgen1.nim → tests/ccgbugs/tccgen1.nim b/tests/compile/tccgen1.nim → tests/ccgbugs/tccgen1.nim
diff --git a/tests/ccgbugs/tcgbug.nim b/tests/ccgbugs/tcgbug.nim
diff --git a/tests/compile/tcodegenbug1.nim → tests/ccgbugs/tcodegenbug1.nim b/tests/compile/tcodegenbug1.nim → tests/ccgbugs/tcodegenbug1.nim
diff --git a/tests/run/tclosure.nim → tests/closure/tclosure.nim b/tests/run/tclosure.nim → tests/closure/tclosure.nim
diff --git a/tests/run/tclosure2.nim → tests/closure/tclosure2.nim b/tests/run/tclosure2.nim → tests/closure/tclosure2.nim
diff --git a/tests/run/tclosure3.nim → tests/closure/tclosure3.nim b/tests/run/tclosure3.nim → tests/closure/tclosure3.nim
diff --git a/tests/compile/tclosure4.nim → tests/closure/tclosure4.nim b/tests/compile/tclosure4.nim → tests/closure/tclosure4.nim
diff --git a/tests/compile/tclosurebug2.nim → tests/closure/tclosurebug2.nim b/tests/compile/tclosurebug2.nim → tests/closure/tclosurebug2.nim
diff --git a/tests/closure/tclosuremacro.nim b/tests/closure/tclosuremacro.nim
diff --git a/tests/run/tinterf.nim → tests/closure/tinterf.nim b/tests/run/tinterf.nim → tests/closure/tinterf.nim
diff --git a/tests/reject/tinvalidclosure.nim → tests/closure/tinvalidclosure.nim b/tests/reject/tinvalidclosure.nim → tests/closure/tinvalidclosure.nim
diff --git a/tests/reject/tinvalidclosure2.nim → tests/closure/tinvalidclosure2.nim b/tests/reject/tinvalidclosure2.nim → tests/closure/tinvalidclosure2.nim
diff --git a/tests/compile/tnamedparamanonproc.nim → tests/closure/tnamedparamanonproc.nim b/tests/compile/tnamedparamanonproc.nim → tests/closure/tnamedparamanonproc.nim
diff --git a/tests/compile/tnestedproc.nim → tests/closure/tnestedproc.nim b/tests/compile/tnestedproc.nim → tests/closure/tnestedproc.nim
diff --git a/tests/run/uclosures.nim → tests/closure/uclosures.nim b/tests/run/uclosures.nim → tests/closure/uclosures.nim
diff --git a/tests/run/tcnstseq.nim → tests/cnstseq/tcnstseq.nim b/tests/run/tcnstseq.nim → tests/cnstseq/tcnstseq.nim
diff --git a/tests/run/tcnstseq2.nim → tests/cnstseq/tcnstseq2.nim b/tests/run/tcnstseq2.nim → tests/cnstseq/tcnstseq2.nim
diff --git a/tests/run/tcnstseq3.nim → tests/cnstseq/tcnstseq3.nim b/tests/run/tcnstseq3.nim → tests/cnstseq/tcnstseq3.nim
diff --git a/tests/collections/tsets.nim b/tests/collections/tsets.nim
diff --git a/tests/collections/ttables.nim b/tests/collections/ttables.nim
diff --git a/tests/compile/tambsym2.nim b/tests/compile/tambsym2.nim
diff --git a/tests/compile/tcompiles.nim b/tests/compile/tcompiles.nim
diff --git a/tests/compile/tdiscardable.nim b/tests/compile/tdiscardable.nim
diff --git a/tests/compile/tmongo.nim b/tests/compile/tmongo.nim
diff --git a/tests/compile/tobjconstr2.nim b/tests/compile/tobjconstr2.nim
diff --git a/tests/compile/tredef.nim b/tests/compile/tredef.nim
diff --git a/tests/compile/tsockets.nim b/tests/compile/tsockets.nim
diff --git a/tests/compile/ttempl5.nim b/tests/compile/ttempl5.nim
diff --git a/tests/compile/tvarious.nim b/tests/compile/tvarious.nim
diff --git a/tests/compiles/tcompiles.nim b/tests/compiles/tcompiles.nim
diff --git a/tests/run/tconcat.nim → tests/concat/tconcat.nim b/tests/run/tconcat.nim → tests/concat/tconcat.nim
diff --git a/tests/run/tnodeadlocks.nim → tests/concurrency/tnodeadlocks.nim b/tests/run/tnodeadlocks.nim → tests/concurrency/tnodeadlocks.nim
diff --git a/tests/reject/tconstr1.nim → tests/constr/tconstr1.nim b/tests/reject/tconstr1.nim → tests/constr/tconstr1.nim
diff --git a/tests/run/tconstr2.nim → tests/constr/tconstr2.nim b/tests/run/tconstr2.nim → tests/constr/tconstr2.nim
diff --git a/tests/reject/tconstraints.nim → tests/constraints/tconstraints.nim b/tests/reject/tconstraints.nim → tests/constraints/tconstraints.nim
diff --git a/tests/reject/tblock1.nim → tests/controlflow/tblock1.nim b/tests/reject/tblock1.nim → tests/controlflow/tblock1.nim
diff --git a/tests/run/tcontinue.nim → tests/controlflow/tcontinue.nim b/tests/run/tcontinue.nim → tests/controlflow/tcontinue.nim
diff --git a/tests/run/tnestif.nim → tests/controlflow/tnestif.nim b/tests/run/tnestif.nim → tests/controlflow/tnestif.nim
diff --git a/tests/reject/tstatret.nim → tests/controlflow/tstatret.nim b/tests/reject/tstatret.nim → tests/controlflow/tstatret.nim
diff --git a/tests/compile/tconvcolors.nim → tests/converter/tconvcolors.nim b/tests/compile/tconvcolors.nim → tests/converter/tconvcolors.nim
diff --git a/tests/compile/tconvert.nim → tests/converter/tconvert.nim b/tests/compile/tconvert.nim → tests/converter/tconvert.nim
diff --git a/tests/run/tgenericconverter.nim → tests/converter/tgenericconverter.nim b/tests/run/tgenericconverter.nim → tests/converter/tgenericconverter.nim
diff --git a/tests/compile/ttypeconverter1.nim → tests/converter/ttypeconverter1.nim b/tests/compile/ttypeconverter1.nim → tests/converter/ttypeconverter1.nim
diff --git a/tests/compile/mdefaultprocparam.nim → tests/defaultprocparam/mdefaultprocparam.nim b/tests/compile/mdefaultprocparam.nim → tests/defaultprocparam/mdefaultprocparam.nim
diff --git a/tests/compile/tdefaultprocparam.nim → tests/defaultprocparam/tdefaultprocparam.nim b/tests/compile/tdefaultprocparam.nim → tests/defaultprocparam/tdefaultprocparam.nim
diff --git a/tests/reject/tdeprecated.nim → tests/deprecated/tdeprecated.nim b/tests/reject/tdeprecated.nim → tests/deprecated/tdeprecated.nim
diff --git a/tests/destructor/tdestructor.nim b/tests/destructor/tdestructor.nim
diff --git a/tests/reject/tdestructor.nim → tests/destructor/tdestructor2.nim b/tests/reject/tdestructor.nim → tests/destructor/tdestructor2.nim
diff --git a/tests/compile/tdictdestruct.nim → tests/destructor/tdictdestruct.nim b/tests/compile/tdictdestruct.nim → tests/destructor/tdictdestruct.nim
diff --git a/tests/discard/tdiscardable.nim b/tests/discard/tdiscardable.nim
diff --git a/tests/discard/tneedsdiscard.nim b/tests/discard/tneedsdiscard.nim
diff --git a/tests/distinct/tborrowdot.nim b/tests/distinct/tborrowdot.nim
diff --git a/tests/run/tcurrncy.nim → tests/distinct/tcurrncy.nim b/tests/run/tcurrncy.nim → tests/distinct/tcurrncy.nim
diff --git a/tests/dll/client.nim b/tests/dll/client.nim
diff --git a/tests/dll/server.nim b/tests/dll/server.nim
diff --git a/tests/reject/teffects1.nim → tests/effects/teffects1.nim b/tests/reject/teffects1.nim → tests/effects/teffects1.nim
diff --git a/tests/reject/teffects2.nim → tests/effects/teffects2.nim b/tests/reject/teffects2.nim → tests/effects/teffects2.nim
diff --git a/tests/reject/teffects3.nim → tests/effects/teffects3.nim b/tests/reject/teffects3.nim → tests/effects/teffects3.nim
diff --git a/tests/reject/teffects4.nim → tests/effects/teffects4.nim b/tests/reject/teffects4.nim → tests/effects/teffects4.nim
diff --git a/tests/reject/teffects5.nim → tests/effects/teffects5.nim b/tests/reject/teffects5.nim → tests/effects/teffects5.nim
diff --git a/tests/compile/teffects1.nim → tests/effects/teffects6.nim b/tests/compile/teffects1.nim → tests/effects/teffects6.nim
diff --git a/tests/reject/tsidee1.nim → tests/effects/tsidee1.nim b/tests/reject/tsidee1.nim → tests/effects/tsidee1.nim
diff --git a/tests/run/tsidee2.nim → tests/effects/tsidee2.nim b/tests/run/tsidee2.nim → tests/effects/tsidee2.nim
diff --git a/tests/run/tsidee3.nim → tests/effects/tsidee3.nim b/tests/run/tsidee3.nim → tests/effects/tsidee3.nim
diff --git a/tests/reject/tsidee4.nim → tests/effects/tsidee4.nim b/tests/reject/tsidee4.nim → tests/effects/tsidee4.nim
diff --git a/tests/compile/tenum.nim → tests/enum/tenum.nim b/tests/compile/tenum.nim → tests/enum/tenum.nim
diff --git a/tests/compile/tenum2.nim → tests/enum/tenum2.nim b/tests/compile/tenum2.nim → tests/enum/tenum2.nim
diff --git a/tests/compile/tenum3.nim → tests/enum/tenum3.nim b/tests/compile/tenum3.nim → tests/enum/tenum3.nim
diff --git a/tests/run/tenumhole.nim → tests/enum/tenumhole.nim b/tests/run/tenumhole.nim → tests/enum/tenumhole.nim
diff --git a/tests/reject/tenumitems.nim → tests/enum/tenumitems.nim b/tests/reject/tenumitems.nim → tests/enum/tenumitems.nim
diff --git a/tests/run/tenumitems.nim → tests/enum/tenumitems2.nim b/tests/run/tenumitems.nim → tests/enum/tenumitems2.nim
diff --git a/tests/reject/tenummix.nim → tests/enum/tenummix.nim b/tests/reject/tenummix.nim → tests/enum/tenummix.nim
diff --git a/tests/run/tnamedenumfields.nim → tests/enum/tnamedenumfields.nim b/tests/run/tnamedenumfields.nim → tests/enum/tnamedenumfields.nim
diff --git a/tests/compile/toptions.nim → tests/enum/toptions.nim b/tests/compile/toptions.nim → tests/enum/toptions.nim
diff --git a/tests/run/tcontinuexc.nim → tests/exception/tcontinuexc.nim b/tests/run/tcontinuexc.nim → tests/exception/tcontinuexc.nim
diff --git a/tests/exception/texceptionbreak.nim b/tests/exception/texceptionbreak.nim
diff --git a/tests/run/texceptions.nim → tests/exception/texceptions.nim b/tests/run/texceptions.nim → tests/exception/texceptions.nim
diff --git a/tests/run/texcpt1.nim → tests/exception/texcpt1.nim b/tests/run/texcpt1.nim → tests/exception/texcpt1.nim
diff --git a/tests/run/texcsub.nim → tests/exception/texcsub.nim b/tests/run/texcsub.nim → tests/exception/texcsub.nim
diff --git a/tests/run/tfinally.nim → tests/exception/tfinally.nim b/tests/run/tfinally.nim → tests/exception/tfinally.nim
diff --git a/tests/run/tfinally2.nim → tests/exception/tfinally2.nim b/tests/run/tfinally2.nim → tests/exception/tfinally2.nim
diff --git a/tests/run/tfinally3.nim → tests/exception/tfinally3.nim b/tests/run/tfinally3.nim → tests/exception/tfinally3.nim
diff --git a/tests/exception/tfinally4.nim b/tests/exception/tfinally4.nim
diff --git a/tests/exception/tnestedreturn.nim b/tests/exception/tnestedreturn.nim
diff --git a/tests/exception/tnestedreturn2.nim b/tests/exception/tnestedreturn2.nim
diff --git a/tests/run/tonraise.nim → tests/exception/tonraise.nim b/tests/run/tonraise.nim → tests/exception/tonraise.nim
diff --git a/tests/run/treraise.nim → tests/exception/treraise.nim b/tests/run/treraise.nim → tests/exception/treraise.nim
diff --git a/tests/run/tunhandledexc.nim → tests/exception/tunhandledexc.nim b/tests/run/tunhandledexc.nim → tests/exception/tunhandledexc.nim
diff --git a/tests/run/twrongexc.nim → tests/exception/twrongexc.nim b/tests/run/twrongexc.nim → tests/exception/twrongexc.nim
diff --git a/tests/exprs/texprstmt.nim b/tests/exprs/texprstmt.nim
diff --git a/tests/exprs/tifexpr_typeinference.nim b/tests/exprs/tifexpr_typeinference.nim
diff --git a/tests/exprs/tstmtexp.nim b/tests/exprs/tstmtexp.nim
diff --git a/tests/run/tstmtexprs.nim → tests/exprs/tstmtexprs.nim b/tests/run/tstmtexprs.nim → tests/exprs/tstmtexprs.nim
diff --git a/tests/run/tfieldindex.nim → tests/fields/tfieldindex.nim b/tests/run/tfieldindex.nim → tests/fields/tfieldindex.nim
diff --git a/tests/run/tfielditerator.nim → tests/fields/tfielditerator.nim b/tests/run/tfielditerator.nim → tests/fields/tfielditerator.nim
diff --git a/tests/run/tfielditerator2.nim → tests/fields/tfielditerator2.nim b/tests/run/tfielditerator2.nim → tests/fields/tfielditerator2.nim
diff --git a/tests/run/tfloat1.nim → tests/float/tfloat1.nim b/tests/run/tfloat1.nim → tests/float/tfloat1.nim
diff --git a/tests/run/tfloat2.nim → tests/float/tfloat2.nim b/tests/run/tfloat2.nim → tests/float/tfloat2.nim
diff --git a/tests/run/tfloat3.nim → tests/float/tfloat3.nim b/tests/run/tfloat3.nim → tests/float/tfloat3.nim
diff --git a/tests/run/mfriends.nim → tests/friends/mfriends.nim b/tests/run/mfriends.nim → tests/friends/mfriends.nim
diff --git a/tests/run/tfriends.nim → tests/friends/tfriends.nim b/tests/run/tfriends.nim → tests/friends/tfriends.nim
diff --git a/tests/gc/gcleak4.nim b/tests/gc/gcleak4.nim
diff --git a/tests/gc/gcleak5.nim b/tests/gc/gcleak5.nim
diff --git a/tests/generics/tbadgenericlambda.nim b/tests/generics/tbadgenericlambda.nim
diff --git a/tests/run/tbintre2.nim → tests/generics/tbintre2.nim b/tests/run/tbintre2.nim → tests/generics/tbintre2.nim
diff --git a/tests/run/tbintree.nim → tests/generics/tbintree.nim b/tests/run/tbintree.nim → tests/generics/tbintree.nim
diff --git a/tests/compile/tcan_alias_generic.nim → tests/generics/tcan_alias_generic.nim b/tests/compile/tcan_alias_generic.nim → tests/generics/tcan_alias_generic.nim
diff --git a/...ompile/tcan_alias_specialised_generic.nim → ...nerics/tcan_alias_specialised_generic.nim b/...ompile/tcan_alias_specialised_generic.nim → ...nerics/tcan_alias_specialised_generic.nim
diff --git a/tests/compile/tcan_inherit_generic.nim → tests/generics/tcan_inherit_generic.nim b/tests/compile/tcan_inherit_generic.nim → tests/generics/tcan_inherit_generic.nim
diff --git a/tests/compile/tcan_specialise_generic.nim → tests/generics/tcan_specialise_generic.nim b/tests/compile/tcan_specialise_generic.nim → tests/generics/tcan_specialise_generic.nim
diff --git a/tests/run/texplicitgeneric1.nim → tests/generics/texplicitgeneric1.nim b/tests/run/texplicitgeneric1.nim → tests/generics/texplicitgeneric1.nim
diff --git a/tests/run/texplicitgeneric2.nim → tests/generics/texplicitgeneric2.nim b/tests/run/texplicitgeneric2.nim → tests/generics/texplicitgeneric2.nim
diff --git a/tests/compile/tforwardgeneric.nim → tests/generics/tforwardgeneric.nim b/tests/compile/tforwardgeneric.nim → tests/generics/tforwardgeneric.nim
diff --git a/tests/compile/tgeneric.nim → tests/generics/tgeneric0.nim b/tests/compile/tgeneric.nim → tests/generics/tgeneric0.nim
diff --git a/tests/run/tgenerics1.nim → tests/generics/tgeneric1.nim b/tests/run/tgenerics1.nim → tests/generics/tgeneric1.nim
diff --git a/tests/compile/tgeneric2.nim → tests/generics/tgeneric2.nim b/tests/compile/tgeneric2.nim → tests/generics/tgeneric2.nim
diff --git a/tests/compile/tgeneric3.nim → tests/generics/tgeneric3.nim b/tests/compile/tgeneric3.nim → tests/generics/tgeneric3.nim
diff --git a/tests/generics/tgeneric4.nim b/tests/generics/tgeneric4.nim
diff --git a/tests/generics/tgenericdefaults.nim b/tests/generics/tgenericdefaults.nim
diff --git a/tests/generics/tgenericlambda.nim b/tests/generics/tgenericlambda.nim
diff --git a/tests/compile/tgenericmatcher.nim → tests/generics/tgenericmatcher.nim b/tests/compile/tgenericmatcher.nim → tests/generics/tgenericmatcher.nim
diff --git a/tests/compile/tgenericmatcher2.nim → tests/generics/tgenericmatcher2.nim b/tests/compile/tgenericmatcher2.nim → tests/generics/tgenericmatcher2.nim
diff --git a/tests/run/tgenericprocvar.nim → tests/generics/tgenericprocvar.nim b/tests/run/tgenericprocvar.nim → tests/generics/tgenericprocvar.nim
diff --git a/tests/compile/tgenericprop.nim → tests/generics/tgenericprop.nim b/tests/compile/tgenericprop.nim → tests/generics/tgenericprop.nim
diff --git a/tests/compile/tgenericrefs.nim → tests/generics/tgenericrefs.nim b/tests/compile/tgenericrefs.nim → tests/generics/tgenericrefs.nim
diff --git a/tests/generics/tgenericshardcases.nim b/tests/generics/tgenericshardcases.nim
diff --git a/tests/compile/tgenerictmpl.nim → tests/generics/tgenerictmpl.nim b/tests/compile/tgenerictmpl.nim → tests/generics/tgenerictmpl.nim
diff --git a/tests/compile/tgenericvariant.nim → tests/generics/tgenericvariant.nim b/tests/compile/tgenericvariant.nim → tests/generics/tgenericvariant.nim
diff --git a/tests/generics/tinferredgenericprocs.nim b/tests/generics/tinferredgenericprocs.nim
diff --git a/tests/generics/tlateboundstatic.nim b/tests/generics/tlateboundstatic.nim
diff --git a/tests/generics/tmetafield.nim b/tests/generics/tmetafield.nim
diff --git a/tests/generics/tsigtypeop.nim b/tests/generics/tsigtypeop.nim
diff --git a/tests/compile/tspecialised_is_equivalent.nim → ...s/generics/tspecialised_is_equivalent.nim b/tests/compile/tspecialised_is_equivalent.nim → ...s/generics/tspecialised_is_equivalent.nim
diff --git a/tests/compile/tthread_generic.nim → tests/generics/tthread_generic.nim b/tests/compile/tthread_generic.nim → tests/generics/tthread_generic.nim
diff --git a/tests/run/tvarargs_vs_generic.nim → tests/generics/tvarargs_vs_generic.nim b/tests/run/tvarargs_vs_generic.nim → tests/generics/tvarargs_vs_generic.nim
diff --git a/tests/run/tgensym.nim → tests/gensym/tgensym.nim b/tests/run/tgensym.nim → tests/gensym/tgensym.nim
diff --git a/tests/compile/tgensymgeneric.nim → tests/gensym/tgensymgeneric.nim b/tests/compile/tgensymgeneric.nim → tests/gensym/tgensymgeneric.nim
diff --git a/tests/run/globalaux.nim → tests/global/globalaux.nim b/tests/run/globalaux.nim → tests/global/globalaux.nim
diff --git a/tests/run/globalaux2.nim → tests/global/globalaux2.nim b/tests/run/globalaux2.nim → tests/global/globalaux2.nim
diff --git a/tests/run/tglobal.nim → tests/global/tglobal.nim b/tests/run/tglobal.nim → tests/global/tglobal.nim
diff --git a/tests/compile/tglobalforvar.nim → tests/global/tglobalforvar.nim b/tests/compile/tglobalforvar.nim → tests/global/tglobalforvar.nim
diff --git a/tests/compile/timplicititems.nim → tests/implicit/timplicititems.nim b/tests/compile/timplicititems.nim → tests/implicit/timplicititems.nim
diff --git a/tests/compile/timplictderef.nim → tests/implicit/timplictderef.nim b/tests/compile/timplictderef.nim → tests/implicit/timplictderef.nim
diff --git a/tests/init/tuninit1.nim b/tests/init/tuninit1.nim
diff --git a/tests/run/tzeroarray.nim → tests/init/tzeroarray.nim b/tests/run/tzeroarray.nim → tests/init/tzeroarray.nim
diff --git a/tests/iter/tanoniter1.nim b/tests/iter/tanoniter1.nim
diff --git a/tests/iter/tchainediterators.nim b/tests/iter/tchainediterators.nim
diff --git a/tests/run/tcountup.nim → tests/iter/tcountup.nim b/tests/run/tcountup.nim → tests/iter/tcountup.nim
diff --git a/tests/compile/titer.nim → tests/iter/titer.nim b/tests/compile/titer.nim → tests/iter/titer.nim
diff --git a/tests/compile/titer2.nim → tests/iter/titer2.nim b/tests/compile/titer2.nim → tests/iter/titer2.nim
diff --git a/tests/run/titer3.nim → tests/iter/titer3.nim b/tests/run/titer3.nim → tests/iter/titer3.nim
diff --git a/tests/reject/titer4.nim → tests/iter/titer4.nim b/tests/reject/titer4.nim → tests/iter/titer4.nim
diff --git a/tests/run/titer5.nim → tests/iter/titer5.nim b/tests/run/titer5.nim → tests/iter/titer5.nim
diff --git a/tests/run/titer6.nim → tests/iter/titer6.nim b/tests/run/titer6.nim → tests/iter/titer6.nim
diff --git a/tests/run/titer7.nim → tests/iter/titer7.nim b/tests/run/titer7.nim → tests/iter/titer7.nim
diff --git a/tests/run/titer8.nim → tests/iter/titer8.nim b/tests/run/titer8.nim → tests/iter/titer8.nim
diff --git a/tests/run/titer9.nim → tests/iter/titer9.nim b/tests/run/titer9.nim → tests/iter/titer9.nim
diff --git a/tests/compile/titer_no_tuple_unpack.nim → tests/iter/titer_no_tuple_unpack.nim b/tests/compile/titer_no_tuple_unpack.nim → tests/iter/titer_no_tuple_unpack.nim
diff --git a/tests/iter/titerable.nim b/tests/iter/titerable.nim
diff --git a/tests/compile/titerovl.nim → tests/iter/titerovl.nim b/tests/compile/titerovl.nim → tests/iter/titerovl.nim
diff --git a/tests/run/titerslice.nim → tests/iter/titerslice.nim b/tests/run/titerslice.nim → tests/iter/titerslice.nim
diff --git a/tests/run/titervaropenarray.nim → tests/iter/titervaropenarray.nim b/tests/run/titervaropenarray.nim → tests/iter/titervaropenarray.nim
diff --git a/tests/run/tmoditer.nim → tests/iter/tmoditer.nim b/tests/run/tmoditer.nim → tests/iter/tmoditer.nim
diff --git a/tests/reject/treciter.nim → tests/iter/treciter.nim b/tests/reject/treciter.nim → tests/iter/treciter.nim
diff --git a/tests/iter/twrongiter.nim b/tests/iter/twrongiter.nim
diff --git a/tests/js.nim b/tests/js.nim
diff --git a/tests/js/test1.nim b/tests/js/test1.nim
diff --git a/tests/js/test2.nim b/tests/js/test2.nim
diff --git a/tests/js/testmagic.nim b/tests/js/testmagic.nim
diff --git a/tests/reject/tlet.nim → tests/let/tlet.nim b/tests/reject/tlet.nim → tests/let/tlet.nim
diff --git a/tests/reject/tlet2.nim → tests/let/tlet2.nim b/tests/reject/tlet2.nim → tests/let/tlet2.nim
diff --git a/tests/run/thexlit.nim → tests/lexer/thexlit.nim b/tests/run/thexlit.nim → tests/lexer/thexlit.nim
diff --git a/tests/compile/thexrange.nim → tests/lexer/thexrange.nim b/tests/compile/thexrange.nim → tests/lexer/thexrange.nim
diff --git a/tests/compile/tident.nim → tests/lexer/tident.nim b/tests/compile/tident.nim → tests/lexer/tident.nim
diff --git a/tests/reject/tind1.nim → tests/lexer/tind1.nim b/tests/reject/tind1.nim → tests/lexer/tind1.nim
diff --git a/tests/compile/tindent1.nim → tests/lexer/tindent1.nim b/tests/compile/tindent1.nim → tests/lexer/tindent1.nim
diff --git a/tests/compile/tlexer.nim → tests/lexer/tlexer.nim b/tests/compile/tlexer.nim → tests/lexer/tlexer.nim
diff --git a/tests/reject/tmissingnl.nim → tests/lexer/tmissingnl.nim b/tests/reject/tmissingnl.nim → tests/lexer/tmissingnl.nim
diff --git a/tests/run/tstrlits.nim → tests/lexer/tstrlits.nim b/tests/run/tstrlits.nim → tests/lexer/tstrlits.nim
diff --git a/tests/reject/tunderscores.nim → tests/lexer/tunderscores.nim b/tests/reject/tunderscores.nim → tests/lexer/tunderscores.nim
diff --git a/tests/run/tkoeniglookup.nim → tests/lookups/tkoeniglookup.nim b/tests/run/tkoeniglookup.nim → tests/lookups/tkoeniglookup.nim
diff --git a/tests/lookups/tredef.nim b/tests/lookups/tredef.nim
diff --git a/tests/macros/tdebugstmt.nim b/tests/macros/tdebugstmt.nim
diff --git a/tests/compile/tdumpast.nim → tests/macros/tdumpast.nim b/tests/compile/tdumpast.nim → tests/macros/tdumpast.nim
diff --git a/tests/compile/tdumpast2.nim → tests/macros/tdumpast2.nim b/tests/compile/tdumpast2.nim → tests/macros/tdumpast2.nim
diff --git a/tests/run/tdumptree.nim → tests/macros/tdumptree.nim b/tests/run/tdumptree.nim → tests/macros/tdumptree.nim
diff --git a/tests/macros/texprcolonexpr.nim b/tests/macros/texprcolonexpr.nim
diff --git a/tests/macros/tgensym.nim b/tests/macros/tgensym.nim
diff --git a/tests/run/tidgen.nim → tests/macros/tidgen.nim b/tests/run/tidgen.nim → tests/macros/tidgen.nim
diff --git a/tests/compile/tmacro1.nim → tests/macros/tmacro1.nim b/tests/compile/tmacro1.nim → tests/macros/tmacro1.nim
diff --git a/tests/run/tmacro2.nim → tests/macros/tmacro2.nim b/tests/run/tmacro2.nim → tests/macros/tmacro2.nim
diff --git a/tests/run/tmacro3.nim → tests/macros/tmacro3.nim b/tests/run/tmacro3.nim → tests/macros/tmacro3.nim
diff --git a/tests/run/tmacro4.nim → tests/macros/tmacro4.nim b/tests/run/tmacro4.nim → tests/macros/tmacro4.nim
diff --git a/tests/compile/tmacro2.nim → tests/macros/tmacro5.nim b/tests/compile/tmacro2.nim → tests/macros/tmacro5.nim
diff --git a/tests/compile/tmacroaspragma.nim → tests/macros/tmacroaspragma.nim b/tests/compile/tmacroaspragma.nim → tests/macros/tmacroaspragma.nim
diff --git a/tests/macros/tmacrogenerics.nim b/tests/macros/tmacrogenerics.nim
diff --git a/tests/run/tmacros1.nim → tests/macros/tmacros1.nim b/tests/run/tmacros1.nim → tests/macros/tmacros1.nim
diff --git a/tests/compile/tmacrostmt.nim → tests/macros/tmacrostmt.nim b/tests/compile/tmacrostmt.nim → tests/macros/tmacrostmt.nim
diff --git a/tests/compile/tmacrotypes.nim → tests/macros/tmacrotypes.nim b/tests/compile/tmacrotypes.nim → tests/macros/tmacrotypes.nim
diff --git a/tests/macros/tmemit.nim b/tests/macros/tmemit.nim
diff --git a/tests/compile/tnimrodnode_for_runtime.nim → tests/macros/tnimrodnode_for_runtime.nim b/tests/compile/tnimrodnode_for_runtime.nim → tests/macros/tnimrodnode_for_runtime.nim
diff --git a/tests/run/tprintf.nim → tests/macros/tprintf.nim b/tests/run/tprintf.nim → tests/macros/tprintf.nim
diff --git a/tests/run/tquotewords.nim → tests/macros/tquotewords.nim b/tests/run/tquotewords.nim → tests/macros/tquotewords.nim
diff --git a/tests/reject/trecmacro.nim → tests/macros/trecmacro.nim b/tests/reject/trecmacro.nim → tests/macros/trecmacro.nim
diff --git a/tests/run/tstringinterp.nim → tests/macros/tstringinterp.nim b/tests/run/tstringinterp.nim → tests/macros/tstringinterp.nim
diff --git a/tests/macros/tvarnimnode.nim b/tests/macros/tvarnimnode.nim
diff --git a/tests/run/tvtable.nim → tests/macros/tvtable.nim b/tests/run/tvtable.nim → tests/macros/tvtable.nim
diff --git a/tests/run/tlowhigh.nim → tests/magics/tlowhigh.nim b/tests/run/tlowhigh.nim → tests/magics/tlowhigh.nim
diff --git a/tests/manyloc/argument_parser/argument_parser.nim b/tests/manyloc/argument_parser/argument_parser.nim
diff --git a/tests/manyloc/keineschweine/dependencies/chipmunk/chipmunk.nim b/tests/manyloc/keineschweine/dependencies/chipmunk/chipmunk.nim
diff --git a/tests/manyloc/keineschweine/dependencies/enet/enet.nim b/tests/manyloc/keineschweine/dependencies/enet/enet.nim
diff --git a/tests/manyloc/keineschweine/dependencies/genpacket/macro_dsl.nim b/tests/manyloc/keineschweine/dependencies/genpacket/macro_dsl.nim
diff --git a/tests/manyloc/keineschweine/dependencies/sfml/sfml.nim b/tests/manyloc/keineschweine/dependencies/sfml/sfml.nim