Move Filesystem helper
improve loader file