Reorganize directory layout, as requested