diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..412eeda
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,22 @@
+# Auto detect text files and perform LF normalization
+* text=auto
+
+# Custom for Visual Studio
+*.cs     diff=csharp
+*.sln    merge=union
+*.csproj merge=union
+*.vbproj merge=union
+*.fsproj merge=union
+*.dbproj merge=union
+
+# Standard to msysgit
+*.doc	 diff=astextplain
+*.DOC	 diff=astextplain
+*.docx diff=astextplain
+*.DOCX diff=astextplain
+*.dot  diff=astextplain
+*.DOT  diff=astextplain
+*.pdf  diff=astextplain
+*.PDF	 diff=astextplain
+*.rtf	 diff=astextplain
+*.RTF	 diff=astextplain
diff --git a/README.md b/README.md
index d9c7678..918a903 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-furry-octo-sansa
+Furry Octo Sansa
 ================
 
-My linux configuration files.
+Some linux configuration files.
diff --git a/varnish-default.vcl b/varnish/varnish-default.vcl
similarity index 100%
rename from varnish-default.vcl
rename to varnish/varnish-default.vcl
diff --git a/.vimrc b/vim/.vimrc
similarity index 100%
rename from .vimrc
rename to vim/.vimrc