Update 2

Altered all classes and header files.
Variables and accessor methods should better reflect our dataset now.