Some reorganisation and eshell configuration
Typo