File/Dir structure definition v0.0

Merge of all code before Noah rebase.