fixed untracked files, moved things around