Enc reorganize folders2

Copy of https://github.com/owncloud/core/pull/12191 because Jenkins refuses to run on #12191