Work on converting over to using single non-web file directory