Reorganize a few of Brian's directories