Add mandatories submodule directories
Improve init