Merge pull request #18 from ioanpocol/master

chore(superdesk lib): Reorganize the code