Refactors filesystem helper

This makes more sense now.
Fixes a bug when not all directories are defined
Bumps version to 2.1.1 [skip ci]