reorganized directory structure slightly