Moved and renamed files; updated .gitignore