Reorganized directory structure slightly