Started re-adding logic to add new directory functionality.  Renamed instance of folder to directory on the public side.