Revert "Revert "Flatten directory structure (matches OReilly Atlas)""

This reverts commit e7bc20992d8f6126832cbb4f0b44168a954fd2dc.