Filesystem helper class created and code is refactored accordingly