Change structure coresponding to shareextras project