Change directory structure.  In process of updating data and cleaning code.