Dir/file list fixes

Server/client were inconsistent, also this was never really meant to behave like this.