massive re-work of the working dir