OwnCloud + refactoring