Re-organized directories.

Renamed to reflect webpage changes.