Correcting filepath junk
Moving to consolidate dirs