Fixing mess up with samples and working directory