Reorganized directories to reflect broader scope.