fixed+removed files

Updated a couple of files, moved, and deleted some.