Renamed files and changed namespaces. Added swp files to gitignore