Fixes up the mess of where files are.