Clean slate.  New directory naming convention