Files name refactor.
Bootstrat init default fields order fix.