Restructured directory.
Reorganized appearance of options section.