Revert "Flatten directory structure (matches OReilly Atlas)"

This reverts commit a62d8cce8f830e05ad09f98080b778f212d3a9d3.