VPT Module Refactor

@lizlux @jsutterfield