Add owncloud role and module reorganization