In ivy-files the organisation can be optional, so we need to handle that better