Fixed untracked and incorrectly tracked files