Cleanup and reroute some file paths