diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 00000000000..bc321db7b21
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,27 @@
+# http://editorconfig.org
+
+root = true
+
+[*]
+charset = utf-8
+insert_final_newline = true
+trim_trailing_whitespace = true
+
+[Makefile]
+indent_style = tab
+indent_size = 4
+
+[*.go]
+indent_style = tab
+indent_size = 4
+
+[*.starlark]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
+
+[*.md]
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..e58f4337edc
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,9 @@
+*/coverage.out
+
+/ocis/bin
+/ocis/dist
+/hugo
+*.key
+*crt
+
+.idea
\ No newline at end of file
diff --git a/ocis/CHANGELOG.md b/CHANGELOG.md
similarity index 100%
rename from ocis/CHANGELOG.md
rename to CHANGELOG.md
diff --git a/ocis/LICENSE b/LICENSE
similarity index 100%
rename from ocis/LICENSE
rename to LICENSE
diff --git a/ocis/README.md b/README.md
similarity index 100%
rename from ocis/README.md
rename to README.md
diff --git a/ocis/.dockerignore b/ocis/.dockerignore
new file mode 100644
index 00000000000..26258eb1549
--- /dev/null
+++ b/ocis/.dockerignore
@@ -0,0 +1,3 @@
+*
+!dist/
+!bin/
diff --git a/ocis/.gitignore b/ocis/.gitignore
deleted file mode 100644
index ecf38b7e080..00000000000
--- a/ocis/.gitignore
+++ /dev/null
@@ -1,18 +0,0 @@
-coverage.out
-
-/bin
-/dist
-/hugo
-*.key
-*crt
-
-/eos-docker
-
-# API acceptance tests
-composer.lock
-/vendor
-vendor-bin/**/vendor
-vendor-bin/**/composer.lock
-tests/acceptance/output
-
-.idea
\ No newline at end of file