Add Filesystem fixed and passing CodeSniffer