Cleaned FileSystemPlugin + Enhanced

THIS NEEDS TESTING!