Reorganize directory for clarity