diff --git a/README.md b/README.md
index 2f4dce1..3c0c478 100644
--- a/README.md
+++ b/README.md
@@ -1 +1,3 @@
-# Buero Infrastruktur
+# Buero Templates for used software deployments
+
+In this repository I collect all ansible playbooks used during my work.
diff --git a/TODO.md b/TODO.md
index 2bf5d95..ee6b607 100644
--- a/TODO.md
+++ b/TODO.md
@@ -1,16 +1,5 @@
 ## todo
 
-### First Version 0.1
-
-- [x] install smbclient php module
-- [x] install ownCloud via task (trusted domains can
-      be added afterwards)
-- [x] configure cron jobs
-- [x] configure caching and file locking
-- [x] add redis to stack and configure it
-- [x] configure log rotation
-- [ ] configure https access in apache2
-
 ### Modifications
 
 - [ ] Build ansible-role-lamp
@@ -21,3 +10,4 @@
 
 - [ ] Build with option to choose between apache and nginx
 - [ ] Build with option to choose different databases
+- [ ] Build with option to choose different php versions
diff --git a/roles/owncloud/tasks/apache.yml b/roles/lamp/tasks/apache.yml
similarity index 100%
rename from roles/owncloud/tasks/apache.yml
rename to roles/lamp/tasks/apache.yml
diff --git a/roles/owncloud/tasks/dependencies.yml b/roles/lamp/tasks/dependencies.yml
similarity index 100%
rename from roles/owncloud/tasks/dependencies.yml
rename to roles/lamp/tasks/dependencies.yml
diff --git a/roles/lamp/tasks/main.yml b/roles/lamp/tasks/main.yml
new file mode 100644
index 0000000..aaa4839
--- /dev/null
+++ b/roles/lamp/tasks/main.yml
@@ -0,0 +1,16 @@
+---
+- name: Install LAMP stack dependencies
+  include_tasks:
+    file: dependencies.yml
+
+- name: Configure Apache.
+  include_tasks:
+    file: apache.yml
+
+- name: Configure PHP.
+  include_tasks:
+    file: php.yml
+
+- name: Configure MySQL.
+  include_tasks:
+    file: mysql.yml
diff --git a/roles/owncloud/tasks/mysql.yml b/roles/lamp/tasks/mysql.yml
similarity index 100%
rename from roles/owncloud/tasks/mysql.yml
rename to roles/lamp/tasks/mysql.yml
diff --git a/roles/owncloud/tasks/php.yml b/roles/lamp/tasks/php.yml
similarity index 100%
rename from roles/owncloud/tasks/php.yml
rename to roles/lamp/tasks/php.yml
diff --git a/roles/owncloud/defaults/main.yml b/roles/owncloud/defaults/main.yml
deleted file mode 100644
index 79ab284..0000000
--- a/roles/owncloud/defaults/main.yml
+++ /dev/null
@@ -1 +0,0 @@
-owncloud_core_path: "/var/www/owncloud"
diff --git a/roles/owncloud/handlers/main.yml b/roles/owncloud/handlers/main.yml
deleted file mode 100644
index af398e8..0000000
--- a/roles/owncloud/handlers/main.yml
+++ /dev/null
@@ -1,5 +0,0 @@
----
-- name: restart apache
-  service:
-    name: apache2
-    state: restarted
diff --git a/roles/owncloud/tasks/configure.yml b/roles/owncloud/tasks/configure.yml
deleted file mode 100644
index 7500a7d..0000000
--- a/roles/owncloud/tasks/configure.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-#- name: Configure Caching and File locking
-#  command: "{{ item }}"
-#  loop: >
-#    - occ config:system:set memcache.local  --value '\OC\Memcache\APCu'
-#    - occ config:system:set memcache.locking --value '\OC\Memcache\Redis'
-#    - occ config:system:set redis --value '{"host": "127.0.0.1", "port": "6379"}' --type json
-
-- name: Configure Log Rotation.
-  template:
-    src: "templates/log-rotation.j2"
-    dest: "/etc/logrotate.d/owncloud"
-    owner: root
-    group: root
diff --git a/roles/owncloud/tasks/main.yml b/roles/owncloud/tasks/main.yml
deleted file mode 100644
index f230f88..0000000
--- a/roles/owncloud/tasks/main.yml
+++ /dev/null
@@ -1,32 +0,0 @@
----
-- name: Install LAMP stack dependencies
-  include_tasks:
-    file: dependencies.yml
-
-- name: Configure Apache.
-  include_tasks:
-    file: apache.yml
-
-- name: Configure PHP.
-  include_tasks:
-    file: php.yml
-
-- name: Configure MySQL.
-  include_tasks:
-    file: mysql.yml
-
-- name: Create occ helper script.
-  include_tasks:
-    file: occ.yml
-
-- name: Download ownCloud.
-  include_tasks:
-    file: owncloud.yml
-
-#- name: Configure Cronjobs.
-#  include_tasks:
-#    file: cron.yml
-
-- name: Configure ownCloud.
-  include_tasks:
-    file: configure.yml
diff --git a/roles/owncloud/tasks/occ.yml b/roles/owncloud/tasks/occ.yml
deleted file mode 100644
index f53ad67..0000000
--- a/roles/owncloud/tasks/occ.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-- name: Create a helper script for running occ commands.
-  template:
-    src: "templates/occ.j2"
-    dest: "/usr/local/bin/occ"
-    owner: root
-    group: root
-    mode: 0755
diff --git a/roles/owncloud/tasks/owncloud.yml b/roles/owncloud/tasks/owncloud.yml
deleted file mode 100644
index 44aec4f..0000000
--- a/roles/owncloud/tasks/owncloud.yml
+++ /dev/null
@@ -1,23 +0,0 @@
----
-- name: Download ownCloud source.
-  ansible.builtin.get_url:
-    url: https://download.owncloud.com/server/stable/owncloud-complete-latest.tar.bz2
-    dest: "/tmp/owncloud-complete-latest.tar.bz2"
-    owner: www-data
-
-- name: Extract the archive.
-  ansible.builtin.unarchive:
-    src: "/tmp/owncloud-complete-latest.tar.bz2"
-    dest: "/var/www/"
-    owner: www-data
-    remote_src: yes
-#- name: Install ownCloud (via occ)
-#  command: >
-#    occ maintenance:install --database "mysql" --database-name "owncloud" --database-user "owncloud" --database-pass "{{ mysql_passwd }}" --data-dir "{{ owncloud_core_path }}/data" --admin-user "root" --admin-pass "{{ mysql_passwd }}"
-#
-#- name: Configure ownCloud's trusted domains
-#  command: "{{ item }}"
-#  loop:
-#    - my_ip=$(hostname -I|cut -f1 -d ' ')
-#    - occ config:system:set trusted_domains 1 --value="$my_ip"
-#    - occ config:system:set trusted_domains 2 --value="{{ hostname }}"
diff --git a/roles/owncloud/templates/log-rotation.j2 b/roles/owncloud/templates/log-rotation.j2
deleted file mode 100644
index cf7b6d0..0000000
--- a/roles/owncloud/templates/log-rotation.j2
+++ /dev/null
@@ -1,8 +0,0 @@
-/var/www/owncloud/data/owncloud.log {
-  size 10M
-  rotate 12
-  copytruncate
-  missingok
-  compress
-  compresscmd /bin/gzip
-}
diff --git a/roles/owncloud/templates/occ.j2 b/roles/owncloud/templates/occ.j2
deleted file mode 100644
index 23cbbd4..0000000
--- a/roles/owncloud/templates/occ.j2
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/bin/bash
-
-cd /var/www/owncloud
-sudo -E -u www-data /usr/bin/php /var/www/owncloud/occ "$@"
diff --git a/roles/owncloud/templates/owncloud.dav.conf.j2 b/roles/owncloud/templates/owncloud.dav.conf.j2
deleted file mode 100644
index f5dc77e..0000000
--- a/roles/owncloud/templates/owncloud.dav.conf.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-<VirtualHost *:80>
-ServerName {{ hostname }}
-DirectoryIndex index.php index.html
-DocumentRoot /var/www/owncloud
-<Directory /var/www/owncloud>
-  Options +FollowSymlinks -Indexes
-  AllowOverride All
-  Require all granted
-
- <IfModule mod_dav.c>
-  Dav off
- </IfModule>
-
- SetEnv HOME /var/www/owncloud
- SetEnv HTTP_HOME /var/www/owncloud
-</Directory>
-</VirtualHost>
diff --git a/roles/owncloud/templates/smbclient.ini.j2 b/roles/owncloud/templates/smbclient.ini.j2
deleted file mode 100644
index f93fe4a..0000000
--- a/roles/owncloud/templates/smbclient.ini.j2
+++ /dev/null
@@ -1 +0,0 @@
-extension=smbclient.so