renamed some files/classes to make more sense, add swap files to gitignore