Refactoring of VPL file structure and clean-up of namespace closing brackets.