Revert "Pretty much how working directory will look like..."

This reverts commit 15af558e6eaf524bce6ceca6c05452ad2a3e669f.
Pretty much how working directory will look like...