Assorted code cleanup and merging VPK and FS handling into the same code files