Moved VFS to own project