Refactor; removed global works variable.
Remove renamed/moved files from git.