Major change

Updated Structure