Add more info logs
Some refactoring for directory initialization