More PVector replacements
change directory and refactor