Improve directory configuration.
Fix init.