Working on Directory schema.
Bugfix file schema.