Feature/share folders

ready for review share-folder changes on server