changed files to reflect change in focus, should be more readable now