Fixed having multiple classes in a single file. Also changed some class/variable names