switched inclusion process to use integer matrices, moved structs to header