Structure of classes added, no logic added