Reorganize directory layout