Some changes
Moved Vector class