Changed names of file/class
Major improvements to functionality of program