Modified file structure.

No major changes.