In prep for redoing the files system structure here