diff --git a/src/passes/1-parser/cameligo.ml b/src/passes/01-parser/cameligo.ml
similarity index 100%
rename from src/passes/1-parser/cameligo.ml
rename to src/passes/01-parser/cameligo.ml
diff --git a/src/passes/1-parser/cameligo.mli b/src/passes/01-parser/cameligo.mli
similarity index 100%
rename from src/passes/1-parser/cameligo.mli
rename to src/passes/01-parser/cameligo.mli
diff --git a/src/passes/1-parser/cameligo/.AST.ml.tag b/src/passes/01-parser/cameligo/.AST.ml.tag
similarity index 100%
rename from src/passes/1-parser/cameligo/.AST.ml.tag
rename to src/passes/01-parser/cameligo/.AST.ml.tag
diff --git a/src/passes/1-parser/cameligo/.LexerMain.tag b/src/passes/01-parser/cameligo/.LexerMain.tag
similarity index 100%
rename from src/passes/1-parser/cameligo/.LexerMain.tag
rename to src/passes/01-parser/cameligo/.LexerMain.tag
diff --git a/src/passes/1-parser/cameligo/.Parser.mly.tag b/src/passes/01-parser/cameligo/.Parser.mly.tag
similarity index 100%
rename from src/passes/1-parser/cameligo/.Parser.mly.tag
rename to src/passes/01-parser/cameligo/.Parser.mly.tag
diff --git a/src/passes/1-parser/cameligo/.ParserMain.tag b/src/passes/01-parser/cameligo/.ParserMain.tag
similarity index 100%
rename from src/passes/1-parser/cameligo/.ParserMain.tag
rename to src/passes/01-parser/cameligo/.ParserMain.tag
diff --git a/src/passes/1-parser/cameligo/.Unlexer.tag b/src/passes/01-parser/cameligo/.Unlexer.tag
similarity index 100%
rename from src/passes/1-parser/cameligo/.Unlexer.tag
rename to src/passes/01-parser/cameligo/.Unlexer.tag
diff --git a/src/passes/1-parser/cameligo/.gitignore b/src/passes/01-parser/cameligo/.gitignore
similarity index 100%
rename from src/passes/1-parser/cameligo/.gitignore
rename to src/passes/01-parser/cameligo/.gitignore
diff --git a/src/passes/1-parser/cameligo/.links b/src/passes/01-parser/cameligo/.links
similarity index 100%
rename from src/passes/1-parser/cameligo/.links
rename to src/passes/01-parser/cameligo/.links
diff --git a/src/passes/1-parser/cameligo/AST.ml b/src/passes/01-parser/cameligo/AST.ml
similarity index 100%
rename from src/passes/1-parser/cameligo/AST.ml
rename to src/passes/01-parser/cameligo/AST.ml
diff --git a/src/passes/1-parser/cameligo/LexToken.mli b/src/passes/01-parser/cameligo/LexToken.mli
similarity index 100%
rename from src/passes/1-parser/cameligo/LexToken.mli
rename to src/passes/01-parser/cameligo/LexToken.mli
diff --git a/src/passes/1-parser/cameligo/LexToken.mll b/src/passes/01-parser/cameligo/LexToken.mll
similarity index 100%
rename from src/passes/1-parser/cameligo/LexToken.mll
rename to src/passes/01-parser/cameligo/LexToken.mll
diff --git a/src/passes/1-parser/cameligo/LexerMain.ml b/src/passes/01-parser/cameligo/LexerMain.ml
similarity index 100%
rename from src/passes/1-parser/cameligo/LexerMain.ml
rename to src/passes/01-parser/cameligo/LexerMain.ml
diff --git a/src/passes/1-parser/cameligo/Makefile.cfg b/src/passes/01-parser/cameligo/Makefile.cfg
similarity index 100%
rename from src/passes/1-parser/cameligo/Makefile.cfg
rename to src/passes/01-parser/cameligo/Makefile.cfg
diff --git a/src/passes/1-parser/cameligo/ParToken.mly b/src/passes/01-parser/cameligo/ParToken.mly
similarity index 100%
rename from src/passes/1-parser/cameligo/ParToken.mly
rename to src/passes/01-parser/cameligo/ParToken.mly
diff --git a/src/passes/1-parser/cameligo/Parser.mly b/src/passes/01-parser/cameligo/Parser.mly
similarity index 100%
rename from src/passes/1-parser/cameligo/Parser.mly
rename to src/passes/01-parser/cameligo/Parser.mly
diff --git a/src/passes/1-parser/cameligo/ParserLog.ml b/src/passes/01-parser/cameligo/ParserLog.ml
similarity index 100%
rename from src/passes/1-parser/cameligo/ParserLog.ml
rename to src/passes/01-parser/cameligo/ParserLog.ml
diff --git a/src/passes/1-parser/cameligo/ParserLog.mli b/src/passes/01-parser/cameligo/ParserLog.mli
similarity index 100%
rename from src/passes/1-parser/cameligo/ParserLog.mli
rename to src/passes/01-parser/cameligo/ParserLog.mli
diff --git a/src/passes/1-parser/cameligo/ParserMain.ml b/src/passes/01-parser/cameligo/ParserMain.ml
similarity index 100%
rename from src/passes/1-parser/cameligo/ParserMain.ml
rename to src/passes/01-parser/cameligo/ParserMain.ml
diff --git a/src/passes/1-parser/cameligo/Scoping.ml b/src/passes/01-parser/cameligo/Scoping.ml
similarity index 100%
rename from src/passes/1-parser/cameligo/Scoping.ml
rename to src/passes/01-parser/cameligo/Scoping.ml
diff --git a/src/passes/1-parser/cameligo/Scoping.mli b/src/passes/01-parser/cameligo/Scoping.mli
similarity index 100%
rename from src/passes/1-parser/cameligo/Scoping.mli
rename to src/passes/01-parser/cameligo/Scoping.mli
diff --git a/src/passes/1-parser/cameligo/Tests/pp.mligo b/src/passes/01-parser/cameligo/Tests/pp.mligo
similarity index 100%
rename from src/passes/1-parser/cameligo/Tests/pp.mligo
rename to src/passes/01-parser/cameligo/Tests/pp.mligo
diff --git a/src/passes/1-parser/cameligo/Unlexer.ml b/src/passes/01-parser/cameligo/Unlexer.ml
similarity index 100%
rename from src/passes/1-parser/cameligo/Unlexer.ml
rename to src/passes/01-parser/cameligo/Unlexer.ml
diff --git a/src/passes/1-parser/cameligo/cameligo.ml b/src/passes/01-parser/cameligo/cameligo.ml
similarity index 100%
rename from src/passes/1-parser/cameligo/cameligo.ml
rename to src/passes/01-parser/cameligo/cameligo.ml
diff --git a/src/passes/1-parser/cameligo/dune b/src/passes/01-parser/cameligo/dune
similarity index 100%
rename from src/passes/1-parser/cameligo/dune
rename to src/passes/01-parser/cameligo/dune
diff --git a/src/passes/1-parser/cameligo/error.messages.checked-in b/src/passes/01-parser/cameligo/error.messages.checked-in
similarity index 100%
rename from src/passes/1-parser/cameligo/error.messages.checked-in
rename to src/passes/01-parser/cameligo/error.messages.checked-in
diff --git a/src/passes/1-parser/dune b/src/passes/01-parser/dune
similarity index 100%
rename from src/passes/1-parser/dune
rename to src/passes/01-parser/dune
diff --git a/src/passes/1-parser/parser.ml b/src/passes/01-parser/parser.ml
similarity index 100%
rename from src/passes/1-parser/parser.ml
rename to src/passes/01-parser/parser.ml
diff --git a/src/passes/1-parser/pascaligo.ml b/src/passes/01-parser/pascaligo.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo.ml
rename to src/passes/01-parser/pascaligo.ml
diff --git a/src/passes/1-parser/pascaligo.mli b/src/passes/01-parser/pascaligo.mli
similarity index 100%
rename from src/passes/1-parser/pascaligo.mli
rename to src/passes/01-parser/pascaligo.mli
diff --git a/src/passes/1-parser/pascaligo/.LexerMain.tag b/src/passes/01-parser/pascaligo/.LexerMain.tag
similarity index 100%
rename from src/passes/1-parser/pascaligo/.LexerMain.tag
rename to src/passes/01-parser/pascaligo/.LexerMain.tag
diff --git a/src/passes/1-parser/pascaligo/.Parser.mly.tag b/src/passes/01-parser/pascaligo/.Parser.mly.tag
similarity index 100%
rename from src/passes/1-parser/pascaligo/.Parser.mly.tag
rename to src/passes/01-parser/pascaligo/.Parser.mly.tag
diff --git a/src/passes/1-parser/pascaligo/.ParserMain.tag b/src/passes/01-parser/pascaligo/.ParserMain.tag
similarity index 100%
rename from src/passes/1-parser/pascaligo/.ParserMain.tag
rename to src/passes/01-parser/pascaligo/.ParserMain.tag
diff --git a/src/passes/1-parser/pascaligo/.Unlexer.tag b/src/passes/01-parser/pascaligo/.Unlexer.tag
similarity index 100%
rename from src/passes/1-parser/pascaligo/.Unlexer.tag
rename to src/passes/01-parser/pascaligo/.Unlexer.tag
diff --git a/src/passes/1-parser/pascaligo/.gitignore b/src/passes/01-parser/pascaligo/.gitignore
similarity index 100%
rename from src/passes/1-parser/pascaligo/.gitignore
rename to src/passes/01-parser/pascaligo/.gitignore
diff --git a/src/passes/1-parser/pascaligo/.links b/src/passes/01-parser/pascaligo/.links
similarity index 100%
rename from src/passes/1-parser/pascaligo/.links
rename to src/passes/01-parser/pascaligo/.links
diff --git a/src/passes/1-parser/pascaligo/AST.ml b/src/passes/01-parser/pascaligo/AST.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/AST.ml
rename to src/passes/01-parser/pascaligo/AST.ml
diff --git a/src/passes/1-parser/pascaligo/Doc/misc.txt b/src/passes/01-parser/pascaligo/Doc/misc.txt
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/misc.txt
rename to src/passes/01-parser/pascaligo/Doc/misc.txt
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo.md b/src/passes/01-parser/pascaligo/Doc/pascaligo.md
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo.md
rename to src/passes/01-parser/pascaligo/Doc/pascaligo.md
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo.txt b/src/passes/01-parser/pascaligo/Doc/pascaligo.txt
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo.txt
rename to src/passes/01-parser/pascaligo/Doc/pascaligo.txt
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_01.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_01.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_01.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_01.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_02.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_02.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_02.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_02.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_03.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_03.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_03.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_03.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_04.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_04.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_04.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_04.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_05.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_05.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_05.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_05.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_06.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_06.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_06.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_06.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_07.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_07.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_07.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_07.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_08.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_08.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_08.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_08.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_09.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_09.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_09.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_09.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_10.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_10.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_10.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_10.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_11.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_11.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_11.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_11.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_12.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_12.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_12.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_12.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_13.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_13.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_13.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_13.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_14.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_14.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_14.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_14.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_15.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_15.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_15.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_15.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_16.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_16.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_16.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_16.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_17.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_17.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_17.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_17.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_18.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_18.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_18.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_18.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_19.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_19.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_19.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_19.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_20.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_20.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_20.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_20.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_21.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_21.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_21.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_21.bnf
diff --git a/src/passes/1-parser/pascaligo/Doc/pascaligo_22.bnf b/src/passes/01-parser/pascaligo/Doc/pascaligo_22.bnf
similarity index 100%
rename from src/passes/1-parser/pascaligo/Doc/pascaligo_22.bnf
rename to src/passes/01-parser/pascaligo/Doc/pascaligo_22.bnf
diff --git a/src/passes/1-parser/pascaligo/LexToken.mli b/src/passes/01-parser/pascaligo/LexToken.mli
similarity index 100%
rename from src/passes/1-parser/pascaligo/LexToken.mli
rename to src/passes/01-parser/pascaligo/LexToken.mli
diff --git a/src/passes/1-parser/pascaligo/LexToken.mll b/src/passes/01-parser/pascaligo/LexToken.mll
similarity index 100%
rename from src/passes/1-parser/pascaligo/LexToken.mll
rename to src/passes/01-parser/pascaligo/LexToken.mll
diff --git a/src/passes/1-parser/pascaligo/LexerMain.ml b/src/passes/01-parser/pascaligo/LexerMain.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/LexerMain.ml
rename to src/passes/01-parser/pascaligo/LexerMain.ml
diff --git a/src/passes/1-parser/pascaligo/Makefile.cfg b/src/passes/01-parser/pascaligo/Makefile.cfg
similarity index 100%
rename from src/passes/1-parser/pascaligo/Makefile.cfg
rename to src/passes/01-parser/pascaligo/Makefile.cfg
diff --git a/src/passes/1-parser/pascaligo/Misc/.SParser.ml.tag b/src/passes/01-parser/pascaligo/Misc/.SParser.ml.tag
similarity index 100%
rename from src/passes/1-parser/pascaligo/Misc/.SParser.ml.tag
rename to src/passes/01-parser/pascaligo/Misc/.SParser.ml.tag
diff --git a/src/passes/1-parser/pascaligo/Misc/SParser.ml b/src/passes/01-parser/pascaligo/Misc/SParser.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/Misc/SParser.ml
rename to src/passes/01-parser/pascaligo/Misc/SParser.ml
diff --git a/src/passes/1-parser/pascaligo/Misc/SParserMain.ml b/src/passes/01-parser/pascaligo/Misc/SParserMain.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/Misc/SParserMain.ml
rename to src/passes/01-parser/pascaligo/Misc/SParserMain.ml
diff --git a/src/passes/1-parser/pascaligo/ParToken.mly b/src/passes/01-parser/pascaligo/ParToken.mly
similarity index 100%
rename from src/passes/1-parser/pascaligo/ParToken.mly
rename to src/passes/01-parser/pascaligo/ParToken.mly
diff --git a/src/passes/1-parser/pascaligo/Parser.mly b/src/passes/01-parser/pascaligo/Parser.mly
similarity index 100%
rename from src/passes/1-parser/pascaligo/Parser.mly
rename to src/passes/01-parser/pascaligo/Parser.mly
diff --git a/src/passes/1-parser/pascaligo/ParserLog.ml b/src/passes/01-parser/pascaligo/ParserLog.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/ParserLog.ml
rename to src/passes/01-parser/pascaligo/ParserLog.ml
diff --git a/src/passes/1-parser/pascaligo/ParserLog.mli b/src/passes/01-parser/pascaligo/ParserLog.mli
similarity index 100%
rename from src/passes/1-parser/pascaligo/ParserLog.mli
rename to src/passes/01-parser/pascaligo/ParserLog.mli
diff --git a/src/passes/1-parser/pascaligo/ParserMain.ml b/src/passes/01-parser/pascaligo/ParserMain.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/ParserMain.ml
rename to src/passes/01-parser/pascaligo/ParserMain.ml
diff --git a/src/passes/1-parser/pascaligo/Scoping.ml b/src/passes/01-parser/pascaligo/Scoping.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/Scoping.ml
rename to src/passes/01-parser/pascaligo/Scoping.ml
diff --git a/src/passes/1-parser/pascaligo/Scoping.mli b/src/passes/01-parser/pascaligo/Scoping.mli
similarity index 100%
rename from src/passes/1-parser/pascaligo/Scoping.mli
rename to src/passes/01-parser/pascaligo/Scoping.mli
diff --git a/src/passes/1-parser/pascaligo/Tests/a.ligo b/src/passes/01-parser/pascaligo/Tests/a.ligo
similarity index 100%
rename from src/passes/1-parser/pascaligo/Tests/a.ligo
rename to src/passes/01-parser/pascaligo/Tests/a.ligo
diff --git a/src/passes/1-parser/pascaligo/Tests/crowdfunding.ligo b/src/passes/01-parser/pascaligo/Tests/crowdfunding.ligo
similarity index 100%
rename from src/passes/1-parser/pascaligo/Tests/crowdfunding.ligo
rename to src/passes/01-parser/pascaligo/Tests/crowdfunding.ligo
diff --git a/src/passes/1-parser/pascaligo/Tests/pp.ligo b/src/passes/01-parser/pascaligo/Tests/pp.ligo
similarity index 100%
rename from src/passes/1-parser/pascaligo/Tests/pp.ligo
rename to src/passes/01-parser/pascaligo/Tests/pp.ligo
diff --git a/src/passes/1-parser/pascaligo/Unlexer.ml b/src/passes/01-parser/pascaligo/Unlexer.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/Unlexer.ml
rename to src/passes/01-parser/pascaligo/Unlexer.ml
diff --git a/src/passes/1-parser/pascaligo/dune b/src/passes/01-parser/pascaligo/dune
similarity index 100%
rename from src/passes/1-parser/pascaligo/dune
rename to src/passes/01-parser/pascaligo/dune
diff --git a/src/passes/1-parser/pascaligo/error.messages.checked-in b/src/passes/01-parser/pascaligo/error.messages.checked-in
similarity index 100%
rename from src/passes/1-parser/pascaligo/error.messages.checked-in
rename to src/passes/01-parser/pascaligo/error.messages.checked-in
diff --git a/src/passes/1-parser/pascaligo/pascaligo.ml b/src/passes/01-parser/pascaligo/pascaligo.ml
similarity index 100%
rename from src/passes/1-parser/pascaligo/pascaligo.ml
rename to src/passes/01-parser/pascaligo/pascaligo.ml
diff --git a/src/passes/1-parser/reasonligo.ml b/src/passes/01-parser/reasonligo.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo.ml
rename to src/passes/01-parser/reasonligo.ml
diff --git a/src/passes/1-parser/reasonligo.mli b/src/passes/01-parser/reasonligo.mli
similarity index 100%
rename from src/passes/1-parser/reasonligo.mli
rename to src/passes/01-parser/reasonligo.mli
diff --git a/src/passes/1-parser/reasonligo/.LexerMain.tag b/src/passes/01-parser/reasonligo/.LexerMain.tag
similarity index 100%
rename from src/passes/1-parser/reasonligo/.LexerMain.tag
rename to src/passes/01-parser/reasonligo/.LexerMain.tag
diff --git a/src/passes/1-parser/reasonligo/.Parser.mly.tag b/src/passes/01-parser/reasonligo/.Parser.mly.tag
similarity index 100%
rename from src/passes/1-parser/reasonligo/.Parser.mly.tag
rename to src/passes/01-parser/reasonligo/.Parser.mly.tag
diff --git a/src/passes/1-parser/reasonligo/.ParserMain.tag b/src/passes/01-parser/reasonligo/.ParserMain.tag
similarity index 100%
rename from src/passes/1-parser/reasonligo/.ParserMain.tag
rename to src/passes/01-parser/reasonligo/.ParserMain.tag
diff --git a/src/passes/1-parser/reasonligo/.Unlexer.tag b/src/passes/01-parser/reasonligo/.Unlexer.tag
similarity index 100%
rename from src/passes/1-parser/reasonligo/.Unlexer.tag
rename to src/passes/01-parser/reasonligo/.Unlexer.tag
diff --git a/src/passes/1-parser/reasonligo/.gitignore b/src/passes/01-parser/reasonligo/.gitignore
similarity index 100%
rename from src/passes/1-parser/reasonligo/.gitignore
rename to src/passes/01-parser/reasonligo/.gitignore
diff --git a/src/passes/1-parser/reasonligo/.links b/src/passes/01-parser/reasonligo/.links
similarity index 100%
rename from src/passes/1-parser/reasonligo/.links
rename to src/passes/01-parser/reasonligo/.links
diff --git a/src/passes/1-parser/reasonligo/LexToken.mli b/src/passes/01-parser/reasonligo/LexToken.mli
similarity index 100%
rename from src/passes/1-parser/reasonligo/LexToken.mli
rename to src/passes/01-parser/reasonligo/LexToken.mli
diff --git a/src/passes/1-parser/reasonligo/LexToken.mll b/src/passes/01-parser/reasonligo/LexToken.mll
similarity index 100%
rename from src/passes/1-parser/reasonligo/LexToken.mll
rename to src/passes/01-parser/reasonligo/LexToken.mll
diff --git a/src/passes/1-parser/reasonligo/LexerMain.ml b/src/passes/01-parser/reasonligo/LexerMain.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo/LexerMain.ml
rename to src/passes/01-parser/reasonligo/LexerMain.ml
diff --git a/src/passes/1-parser/reasonligo/Makefile.cfg b/src/passes/01-parser/reasonligo/Makefile.cfg
similarity index 100%
rename from src/passes/1-parser/reasonligo/Makefile.cfg
rename to src/passes/01-parser/reasonligo/Makefile.cfg
diff --git a/src/passes/1-parser/reasonligo/Misc/Misc.ml b/src/passes/01-parser/reasonligo/Misc/Misc.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo/Misc/Misc.ml
rename to src/passes/01-parser/reasonligo/Misc/Misc.ml
diff --git a/src/passes/1-parser/reasonligo/ParToken.mly b/src/passes/01-parser/reasonligo/ParToken.mly
similarity index 100%
rename from src/passes/1-parser/reasonligo/ParToken.mly
rename to src/passes/01-parser/reasonligo/ParToken.mly
diff --git a/src/passes/1-parser/reasonligo/Parser.mly b/src/passes/01-parser/reasonligo/Parser.mly
similarity index 100%
rename from src/passes/1-parser/reasonligo/Parser.mly
rename to src/passes/01-parser/reasonligo/Parser.mly
diff --git a/src/passes/1-parser/reasonligo/ParserMain.ml b/src/passes/01-parser/reasonligo/ParserMain.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo/ParserMain.ml
rename to src/passes/01-parser/reasonligo/ParserMain.ml
diff --git a/src/passes/1-parser/reasonligo/Stubs/Parser_cameligo.ml b/src/passes/01-parser/reasonligo/Stubs/Parser_cameligo.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo/Stubs/Parser_cameligo.ml
rename to src/passes/01-parser/reasonligo/Stubs/Parser_cameligo.ml
diff --git a/src/passes/1-parser/reasonligo/SyntaxError.ml b/src/passes/01-parser/reasonligo/SyntaxError.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo/SyntaxError.ml
rename to src/passes/01-parser/reasonligo/SyntaxError.ml
diff --git a/src/passes/1-parser/reasonligo/SyntaxError.mli b/src/passes/01-parser/reasonligo/SyntaxError.mli
similarity index 100%
rename from src/passes/1-parser/reasonligo/SyntaxError.mli
rename to src/passes/01-parser/reasonligo/SyntaxError.mli
diff --git a/src/passes/1-parser/reasonligo/Unlexer.ml b/src/passes/01-parser/reasonligo/Unlexer.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo/Unlexer.ml
rename to src/passes/01-parser/reasonligo/Unlexer.ml
diff --git a/src/passes/1-parser/reasonligo/dune b/src/passes/01-parser/reasonligo/dune
similarity index 100%
rename from src/passes/1-parser/reasonligo/dune
rename to src/passes/01-parser/reasonligo/dune
diff --git a/src/passes/1-parser/reasonligo/error.messages.checked-in b/src/passes/01-parser/reasonligo/error.messages.checked-in
similarity index 100%
rename from src/passes/1-parser/reasonligo/error.messages.checked-in
rename to src/passes/01-parser/reasonligo/error.messages.checked-in
diff --git a/src/passes/1-parser/reasonligo/reasonligo.ml b/src/passes/01-parser/reasonligo/reasonligo.ml
similarity index 100%
rename from src/passes/1-parser/reasonligo/reasonligo.ml
rename to src/passes/01-parser/reasonligo/reasonligo.ml
diff --git a/src/passes/1-parser/shared/Doc/shared.txt b/src/passes/01-parser/shared/Doc/shared.txt
similarity index 100%
rename from src/passes/1-parser/shared/Doc/shared.txt
rename to src/passes/01-parser/shared/Doc/shared.txt
diff --git a/src/passes/1-parser/shared/EvalOpt.ml b/src/passes/01-parser/shared/EvalOpt.ml
similarity index 100%
rename from src/passes/1-parser/shared/EvalOpt.ml
rename to src/passes/01-parser/shared/EvalOpt.ml
diff --git a/src/passes/1-parser/shared/EvalOpt.mli b/src/passes/01-parser/shared/EvalOpt.mli
similarity index 100%
rename from src/passes/1-parser/shared/EvalOpt.mli
rename to src/passes/01-parser/shared/EvalOpt.mli
diff --git a/src/passes/1-parser/shared/FQueue.ml b/src/passes/01-parser/shared/FQueue.ml
similarity index 100%
rename from src/passes/1-parser/shared/FQueue.ml
rename to src/passes/01-parser/shared/FQueue.ml
diff --git a/src/passes/1-parser/shared/FQueue.mli b/src/passes/01-parser/shared/FQueue.mli
similarity index 100%
rename from src/passes/1-parser/shared/FQueue.mli
rename to src/passes/01-parser/shared/FQueue.mli
diff --git a/src/passes/1-parser/shared/Lexer.mli b/src/passes/01-parser/shared/Lexer.mli
similarity index 100%
rename from src/passes/1-parser/shared/Lexer.mli
rename to src/passes/01-parser/shared/Lexer.mli
diff --git a/src/passes/1-parser/shared/Lexer.mll b/src/passes/01-parser/shared/Lexer.mll
similarity index 100%
rename from src/passes/1-parser/shared/Lexer.mll
rename to src/passes/01-parser/shared/Lexer.mll
diff --git a/src/passes/1-parser/shared/LexerLib.ml b/src/passes/01-parser/shared/LexerLib.ml
similarity index 100%
rename from src/passes/1-parser/shared/LexerLib.ml
rename to src/passes/01-parser/shared/LexerLib.ml
diff --git a/src/passes/1-parser/shared/LexerLib.mli b/src/passes/01-parser/shared/LexerLib.mli
similarity index 100%
rename from src/passes/1-parser/shared/LexerLib.mli
rename to src/passes/01-parser/shared/LexerLib.mli
diff --git a/src/passes/1-parser/shared/LexerLog.ml b/src/passes/01-parser/shared/LexerLog.ml
similarity index 100%
rename from src/passes/1-parser/shared/LexerLog.ml
rename to src/passes/01-parser/shared/LexerLog.ml
diff --git a/src/passes/1-parser/shared/LexerLog.mli b/src/passes/01-parser/shared/LexerLog.mli
similarity index 100%
rename from src/passes/1-parser/shared/LexerLog.mli
rename to src/passes/01-parser/shared/LexerLog.mli
diff --git a/src/passes/1-parser/shared/LexerUnit.ml b/src/passes/01-parser/shared/LexerUnit.ml
similarity index 100%
rename from src/passes/1-parser/shared/LexerUnit.ml
rename to src/passes/01-parser/shared/LexerUnit.ml
diff --git a/src/passes/1-parser/shared/LexerUnit.mli b/src/passes/01-parser/shared/LexerUnit.mli
similarity index 100%
rename from src/passes/1-parser/shared/LexerUnit.mli
rename to src/passes/01-parser/shared/LexerUnit.mli
diff --git a/src/passes/1-parser/shared/Markup.ml b/src/passes/01-parser/shared/Markup.ml
similarity index 100%
rename from src/passes/1-parser/shared/Markup.ml
rename to src/passes/01-parser/shared/Markup.ml
diff --git a/src/passes/1-parser/shared/Markup.mli b/src/passes/01-parser/shared/Markup.mli
similarity index 100%
rename from src/passes/1-parser/shared/Markup.mli
rename to src/passes/01-parser/shared/Markup.mli
diff --git a/src/passes/1-parser/shared/Memo.ml b/src/passes/01-parser/shared/Memo.ml
similarity index 100%
rename from src/passes/1-parser/shared/Memo.ml
rename to src/passes/01-parser/shared/Memo.ml
diff --git a/src/passes/1-parser/shared/Memo.mli b/src/passes/01-parser/shared/Memo.mli
similarity index 100%
rename from src/passes/1-parser/shared/Memo.mli
rename to src/passes/01-parser/shared/Memo.mli
diff --git a/src/passes/1-parser/shared/ParserAPI.ml b/src/passes/01-parser/shared/ParserAPI.ml
similarity index 100%
rename from src/passes/1-parser/shared/ParserAPI.ml
rename to src/passes/01-parser/shared/ParserAPI.ml
diff --git a/src/passes/1-parser/shared/ParserAPI.mli b/src/passes/01-parser/shared/ParserAPI.mli
similarity index 100%
rename from src/passes/1-parser/shared/ParserAPI.mli
rename to src/passes/01-parser/shared/ParserAPI.mli
diff --git a/src/passes/1-parser/shared/ParserUnit.ml b/src/passes/01-parser/shared/ParserUnit.ml
similarity index 100%
rename from src/passes/1-parser/shared/ParserUnit.ml
rename to src/passes/01-parser/shared/ParserUnit.ml
diff --git a/src/passes/1-parser/shared/ParserUnit.mli b/src/passes/01-parser/shared/ParserUnit.mli
similarity index 100%
rename from src/passes/1-parser/shared/ParserUnit.mli
rename to src/passes/01-parser/shared/ParserUnit.mli
diff --git a/src/passes/1-parser/shared/Utils.ml b/src/passes/01-parser/shared/Utils.ml
similarity index 100%
rename from src/passes/1-parser/shared/Utils.ml
rename to src/passes/01-parser/shared/Utils.ml
diff --git a/src/passes/1-parser/shared/Utils.mli b/src/passes/01-parser/shared/Utils.mli
similarity index 100%
rename from src/passes/1-parser/shared/Utils.mli
rename to src/passes/01-parser/shared/Utils.mli
diff --git a/src/passes/1-parser/shared/dune b/src/passes/01-parser/shared/dune
similarity index 100%
rename from src/passes/1-parser/shared/dune
rename to src/passes/01-parser/shared/dune
diff --git a/src/passes/2-concrete_to_imperative/cameligo.ml b/src/passes/02-concrete_to_imperative/cameligo.ml
similarity index 100%
rename from src/passes/2-concrete_to_imperative/cameligo.ml
rename to src/passes/02-concrete_to_imperative/cameligo.ml
diff --git a/src/passes/2-concrete_to_imperative/cameligo.mli b/src/passes/02-concrete_to_imperative/cameligo.mli
similarity index 100%
rename from src/passes/2-concrete_to_imperative/cameligo.mli
rename to src/passes/02-concrete_to_imperative/cameligo.mli
diff --git a/src/passes/2-concrete_to_imperative/camligo.ml.old b/src/passes/02-concrete_to_imperative/camligo.ml.old
similarity index 100%
rename from src/passes/2-concrete_to_imperative/camligo.ml.old
rename to src/passes/02-concrete_to_imperative/camligo.ml.old
diff --git a/src/passes/2-concrete_to_imperative/concrete_to_imperative.ml b/src/passes/02-concrete_to_imperative/concrete_to_imperative.ml
similarity index 100%
rename from src/passes/2-concrete_to_imperative/concrete_to_imperative.ml
rename to src/passes/02-concrete_to_imperative/concrete_to_imperative.ml
diff --git a/src/passes/2-concrete_to_imperative/dune b/src/passes/02-concrete_to_imperative/dune
similarity index 100%
rename from src/passes/2-concrete_to_imperative/dune
rename to src/passes/02-concrete_to_imperative/dune
diff --git a/src/passes/2-concrete_to_imperative/pascaligo.ml b/src/passes/02-concrete_to_imperative/pascaligo.ml
similarity index 100%
rename from src/passes/2-concrete_to_imperative/pascaligo.ml
rename to src/passes/02-concrete_to_imperative/pascaligo.ml
diff --git a/src/passes/2-concrete_to_imperative/pascaligo.mli b/src/passes/02-concrete_to_imperative/pascaligo.mli
similarity index 100%
rename from src/passes/2-concrete_to_imperative/pascaligo.mli
rename to src/passes/02-concrete_to_imperative/pascaligo.mli
diff --git a/src/passes/3-self_ast_imperative/dune b/src/passes/03-self_ast_imperative/dune
similarity index 100%
rename from src/passes/3-self_ast_imperative/dune
rename to src/passes/03-self_ast_imperative/dune
diff --git a/src/passes/3-self_ast_imperative/entrypoints_length_limit.ml b/src/passes/03-self_ast_imperative/entrypoints_length_limit.ml
similarity index 100%
rename from src/passes/3-self_ast_imperative/entrypoints_length_limit.ml
rename to src/passes/03-self_ast_imperative/entrypoints_length_limit.ml
diff --git a/src/passes/3-self_ast_imperative/helpers.ml b/src/passes/03-self_ast_imperative/helpers.ml
similarity index 100%
rename from src/passes/3-self_ast_imperative/helpers.ml
rename to src/passes/03-self_ast_imperative/helpers.ml
diff --git a/src/passes/3-self_ast_imperative/literals.ml b/src/passes/03-self_ast_imperative/literals.ml
similarity index 100%
rename from src/passes/3-self_ast_imperative/literals.ml
rename to src/passes/03-self_ast_imperative/literals.ml
diff --git a/src/passes/3-self_ast_imperative/none_variant.ml b/src/passes/03-self_ast_imperative/none_variant.ml
similarity index 100%
rename from src/passes/3-self_ast_imperative/none_variant.ml
rename to src/passes/03-self_ast_imperative/none_variant.ml
diff --git a/src/passes/3-self_ast_imperative/self_ast_imperative.ml b/src/passes/03-self_ast_imperative/self_ast_imperative.ml
similarity index 100%
rename from src/passes/3-self_ast_imperative/self_ast_imperative.ml
rename to src/passes/03-self_ast_imperative/self_ast_imperative.ml
diff --git a/src/passes/3-self_ast_imperative/tezos_type_annotation.ml b/src/passes/03-self_ast_imperative/tezos_type_annotation.ml
similarity index 100%
rename from src/passes/3-self_ast_imperative/tezos_type_annotation.ml
rename to src/passes/03-self_ast_imperative/tezos_type_annotation.ml
diff --git a/src/passes/4-imperative_to_sugar/dune b/src/passes/04-imperative_to_sugar/dune
similarity index 100%
rename from src/passes/4-imperative_to_sugar/dune
rename to src/passes/04-imperative_to_sugar/dune
diff --git a/src/passes/4-imperative_to_sugar/imperative_to_sugar.ml b/src/passes/04-imperative_to_sugar/imperative_to_sugar.ml
similarity index 100%
rename from src/passes/4-imperative_to_sugar/imperative_to_sugar.ml
rename to src/passes/04-imperative_to_sugar/imperative_to_sugar.ml
diff --git a/src/passes/5-self_ast_sugar/dune b/src/passes/05-self_ast_sugar/dune
similarity index 100%
rename from src/passes/5-self_ast_sugar/dune
rename to src/passes/05-self_ast_sugar/dune
diff --git a/src/passes/5-self_ast_sugar/helpers.ml b/src/passes/05-self_ast_sugar/helpers.ml
similarity index 100%
rename from src/passes/5-self_ast_sugar/helpers.ml
rename to src/passes/05-self_ast_sugar/helpers.ml
diff --git a/src/passes/5-self_ast_sugar/self_ast_sugar.ml b/src/passes/05-self_ast_sugar/self_ast_sugar.ml
similarity index 100%
rename from src/passes/5-self_ast_sugar/self_ast_sugar.ml
rename to src/passes/05-self_ast_sugar/self_ast_sugar.ml
diff --git a/src/passes/6-sugar_to_core/dune b/src/passes/06-sugar_to_core/dune
similarity index 100%
rename from src/passes/6-sugar_to_core/dune
rename to src/passes/06-sugar_to_core/dune
diff --git a/src/passes/6-sugar_to_core/sugar_to_core.ml b/src/passes/06-sugar_to_core/sugar_to_core.ml
similarity index 100%
rename from src/passes/6-sugar_to_core/sugar_to_core.ml
rename to src/passes/06-sugar_to_core/sugar_to_core.ml
diff --git a/src/passes/7-self_ast_core/dune b/src/passes/07-self_ast_core/dune
similarity index 100%
rename from src/passes/7-self_ast_core/dune
rename to src/passes/07-self_ast_core/dune
diff --git a/src/passes/7-self_ast_core/helpers.ml b/src/passes/07-self_ast_core/helpers.ml
similarity index 100%
rename from src/passes/7-self_ast_core/helpers.ml
rename to src/passes/07-self_ast_core/helpers.ml
diff --git a/src/passes/7-self_ast_core/self_ast_core.ml b/src/passes/07-self_ast_core/self_ast_core.ml
similarity index 100%
rename from src/passes/7-self_ast_core/self_ast_core.ml
rename to src/passes/07-self_ast_core/self_ast_core.ml
diff --git a/src/passes/8-typer-new/PP.ml b/src/passes/08-typer-new/PP.ml
similarity index 100%
rename from src/passes/8-typer-new/PP.ml
rename to src/passes/08-typer-new/PP.ml
diff --git a/src/passes/8-typer-new/README b/src/passes/08-typer-new/README
similarity index 100%
rename from src/passes/8-typer-new/README
rename to src/passes/08-typer-new/README
diff --git a/src/passes/8-typer-new/constraint_databases.ml b/src/passes/08-typer-new/constraint_databases.ml
similarity index 100%
rename from src/passes/8-typer-new/constraint_databases.ml
rename to src/passes/08-typer-new/constraint_databases.ml
diff --git a/src/passes/8-typer-new/dune b/src/passes/08-typer-new/dune
similarity index 100%
rename from src/passes/8-typer-new/dune
rename to src/passes/08-typer-new/dune
diff --git a/src/passes/8-typer-new/errors.ml b/src/passes/08-typer-new/errors.ml
similarity index 100%
rename from src/passes/8-typer-new/errors.ml
rename to src/passes/08-typer-new/errors.ml
diff --git a/src/passes/8-typer-new/heuristic_break_ctor.ml b/src/passes/08-typer-new/heuristic_break_ctor.ml
similarity index 100%
rename from src/passes/8-typer-new/heuristic_break_ctor.ml
rename to src/passes/08-typer-new/heuristic_break_ctor.ml
diff --git a/src/passes/8-typer-new/heuristic_specialize1.ml b/src/passes/08-typer-new/heuristic_specialize1.ml
similarity index 100%
rename from src/passes/8-typer-new/heuristic_specialize1.ml
rename to src/passes/08-typer-new/heuristic_specialize1.ml
diff --git a/src/passes/8-typer-new/normalizer.ml b/src/passes/08-typer-new/normalizer.ml
similarity index 100%
rename from src/passes/8-typer-new/normalizer.ml
rename to src/passes/08-typer-new/normalizer.ml
diff --git a/src/passes/8-typer-new/solver.ml b/src/passes/08-typer-new/solver.ml
similarity index 100%
rename from src/passes/8-typer-new/solver.ml
rename to src/passes/08-typer-new/solver.ml
diff --git a/src/passes/8-typer-new/solver_should_be_generated.ml b/src/passes/08-typer-new/solver_should_be_generated.ml
similarity index 100%
rename from src/passes/8-typer-new/solver_should_be_generated.ml
rename to src/passes/08-typer-new/solver_should_be_generated.ml
diff --git a/src/passes/08-typer-new/solver_types.ml b/src/passes/08-typer-new/solver_types.ml
new file mode 100644
index 000000000..9690d9c0a
--- /dev/null
+++ b/src/passes/08-typer-new/solver_types.ml
@@ -0,0 +1,18 @@
+open Ast_typed.Types
+
+type 'old_constraint_type selector_input = 'old_constraint_type (* some info about the constraint just added, so that we know what to look for *)
+type 'selector_output selector_outputs =
+    WasSelected of 'selector_output list
+  | WasNotSelected
+type new_constraints = type_constraint list
+type new_assignments = c_constructor_simpl list
+type ('old_constraint_type, 'selector_output) selector = 'old_constraint_type selector_input -> structured_dbs -> 'selector_output selector_outputs
+type 'selector_output propagator = 'selector_output -> structured_dbs -> new_constraints * new_assignments
+
+(* state+list monad *)
+type ('state, 'elt) state_list_monad = { state: 'state ; list : 'elt list }
+let lift_state_list_monad ~state ~list = { state ; list }
+let lift f =
+  fun { state ; list } ->
+    let (new_state , new_lists) = List.fold_map_acc f state list in
+    { state = new_state ; list = List.flatten new_lists }
diff --git a/src/passes/8-typer-new/todo_use_fold_generator.ml b/src/passes/08-typer-new/todo_use_fold_generator.ml
similarity index 100%
rename from src/passes/8-typer-new/todo_use_fold_generator.ml
rename to src/passes/08-typer-new/todo_use_fold_generator.ml
diff --git a/src/passes/8-typer-new/typelang.ml b/src/passes/08-typer-new/typelang.ml
similarity index 100%
rename from src/passes/8-typer-new/typelang.ml
rename to src/passes/08-typer-new/typelang.ml
diff --git a/src/passes/8-typer-new/typer.ml b/src/passes/08-typer-new/typer.ml
similarity index 100%
rename from src/passes/8-typer-new/typer.ml
rename to src/passes/08-typer-new/typer.ml
diff --git a/src/passes/8-typer-new/typer.ml.old b/src/passes/08-typer-new/typer.ml.old
similarity index 100%
rename from src/passes/8-typer-new/typer.ml.old
rename to src/passes/08-typer-new/typer.ml.old
diff --git a/src/passes/8-typer-new/typer.mli b/src/passes/08-typer-new/typer.mli
similarity index 100%
rename from src/passes/8-typer-new/typer.mli
rename to src/passes/08-typer-new/typer.mli
diff --git a/src/passes/8-typer-new/typer_new.ml b/src/passes/08-typer-new/typer_new.ml
similarity index 100%
rename from src/passes/8-typer-new/typer_new.ml
rename to src/passes/08-typer-new/typer_new.ml
diff --git a/src/passes/8-typer-new/untyper.ml b/src/passes/08-typer-new/untyper.ml
similarity index 100%
rename from src/passes/8-typer-new/untyper.ml
rename to src/passes/08-typer-new/untyper.ml
diff --git a/src/passes/8-typer-new/wrap.ml b/src/passes/08-typer-new/wrap.ml
similarity index 100%
rename from src/passes/8-typer-new/wrap.ml
rename to src/passes/08-typer-new/wrap.ml
diff --git a/src/passes/8-typer-old/dune b/src/passes/08-typer-old/dune
similarity index 100%
rename from src/passes/8-typer-old/dune
rename to src/passes/08-typer-old/dune
diff --git a/src/passes/8-typer-old/typer.ml b/src/passes/08-typer-old/typer.ml
similarity index 100%
rename from src/passes/8-typer-old/typer.ml
rename to src/passes/08-typer-old/typer.ml
diff --git a/src/passes/8-typer-old/typer.mli b/src/passes/08-typer-old/typer.mli
similarity index 100%
rename from src/passes/8-typer-old/typer.mli
rename to src/passes/08-typer-old/typer.mli
diff --git a/src/passes/8-typer-old/typer_old.ml b/src/passes/08-typer-old/typer_old.ml
similarity index 100%
rename from src/passes/8-typer-old/typer_old.ml
rename to src/passes/08-typer-old/typer_old.ml
diff --git a/src/passes/8-typer/dune b/src/passes/08-typer/dune
similarity index 100%
rename from src/passes/8-typer/dune
rename to src/passes/08-typer/dune
diff --git a/src/passes/8-typer/typer.ml b/src/passes/08-typer/typer.ml
similarity index 100%
rename from src/passes/8-typer/typer.ml
rename to src/passes/08-typer/typer.ml
diff --git a/src/passes/8-typer/typer.mli b/src/passes/08-typer/typer.mli
similarity index 100%
rename from src/passes/8-typer/typer.mli
rename to src/passes/08-typer/typer.mli
diff --git a/src/passes/9-self_ast_typed/contract_passes.ml b/src/passes/09-self_ast_typed/contract_passes.ml
similarity index 100%
rename from src/passes/9-self_ast_typed/contract_passes.ml
rename to src/passes/09-self_ast_typed/contract_passes.ml
diff --git a/src/passes/9-self_ast_typed/dune b/src/passes/09-self_ast_typed/dune
similarity index 100%
rename from src/passes/9-self_ast_typed/dune
rename to src/passes/09-self_ast_typed/dune
diff --git a/src/passes/9-self_ast_typed/helpers.ml b/src/passes/09-self_ast_typed/helpers.ml
similarity index 100%
rename from src/passes/9-self_ast_typed/helpers.ml
rename to src/passes/09-self_ast_typed/helpers.ml
diff --git a/src/passes/9-self_ast_typed/michelson_layout.ml b/src/passes/09-self_ast_typed/michelson_layout.ml
similarity index 100%
rename from src/passes/9-self_ast_typed/michelson_layout.ml
rename to src/passes/09-self_ast_typed/michelson_layout.ml
diff --git a/src/passes/9-self_ast_typed/no_nested_big_map.ml b/src/passes/09-self_ast_typed/no_nested_big_map.ml
similarity index 100%
rename from src/passes/9-self_ast_typed/no_nested_big_map.ml
rename to src/passes/09-self_ast_typed/no_nested_big_map.ml
diff --git a/src/passes/9-self_ast_typed/self_ast_typed.ml b/src/passes/09-self_ast_typed/self_ast_typed.ml
similarity index 100%
rename from src/passes/9-self_ast_typed/self_ast_typed.ml
rename to src/passes/09-self_ast_typed/self_ast_typed.ml
diff --git a/src/passes/9-self_ast_typed/tail_recursion.ml b/src/passes/09-self_ast_typed/tail_recursion.ml
similarity index 100%
rename from src/passes/9-self_ast_typed/tail_recursion.ml
rename to src/passes/09-self_ast_typed/tail_recursion.ml
diff --git a/src/test/dune b/src/test/dune
index ec07b3665..cc571bfdf 100644
--- a/src/test/dune
+++ b/src/test/dune
@@ -24,9 +24,9 @@
   (name parser-negative-tests)
   (action (run ./parser_negative_tests.exe))
   (deps
-    ../passes/1-parser/pascaligo/all.ligo
-    ../passes/1-parser/cameligo/all.mligo
-    ../passes/1-parser/reasonligo/all.religo
+    ../passes/01-parser/pascaligo/all.ligo
+    ../passes/01-parser/cameligo/all.mligo
+    ../passes/01-parser/reasonligo/all.religo
   ))
 
 (alias
diff --git a/src/test/parser_negative_tests.ml b/src/test/parser_negative_tests.ml
index 038bca7f7..9e25411ec 100644
--- a/src/test/parser_negative_tests.ml
+++ b/src/test/parser_negative_tests.ml
@@ -3,13 +3,13 @@ open Trace
 
 type 'a sdata = { erroneous_source_file : string ; parser : string -> 'a result }
 let pascaligo_sdata = {
-  erroneous_source_file = "../passes/1-parser/pascaligo/all.ligo" ;
+  erroneous_source_file = "../passes/01-parser/pascaligo/all.ligo" ;
   parser = Parser.Pascaligo.parse_expression }
 let cameligo_sdata = {
-  erroneous_source_file = "../passes/1-parser/cameligo/all.mligo" ;
+  erroneous_source_file = "../passes/01-parser/cameligo/all.mligo" ;
   parser = Parser.Cameligo.parse_expression }
 let reasonligo_sdata = {
-  erroneous_source_file = "../passes/1-parser/reasonligo/all.religo" ;
+  erroneous_source_file = "../passes/01-parser/reasonligo/all.religo" ;
   parser = Parser.Reasonligo.parse_expression }
 
 let get_exp_as_string filename =