Moved some file names around. Completed #1 and most of #2.