Reorganized directory structure and made all H2 tags underlined