Start restructuring file clustering. Also fixes shell_cwd similarity