Updated file system structure.

The long, neglected task has finally been completed.