Changed dirs structure to match the default be.shell one