Remove VAST-specific types & reorganize code