More clean up (started fixing file links)