Separated into header files. Changed arrays to vectors.