moar vmfs and fixes at the new structure