Rework [WIP]

:construction: 
@georgehrke @raghunayyar What is this about? 3rdparty with owncloud namespace? WTF?