Package refactoring, other refactoring, Vector removed where wasn't needed, individual reset method was fixed