A bit more directory restructuring based on Lex and Anthony's feedback.