Moved vec out of class

Moved vec out of class and added typedef as needed