Refactor ImportWorkbookFileService and UserSelection (moved to nursery/demo packages)