added and edited class files all OOps based