updated class structure to reflect changes from master.