Restructured types
Added vim tmp file to .gitignore