Added untracked files and removed old, unnecessary ones